From 99a7adc5a518e5137021a1dcab5def2f48773043 Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:02:57 +0000
Subject: [PATCH 01/24] Generated from 1f1421f9fdbf67ac8c1ac7f540346d3e98eef77e
 (#4431)

remove x-ms-odata
---
 sdk/apimanagement/arm-apimanagement/README.md |  10 +-
 .../arm-apimanagement/package.json            |  10 +-
 .../arm-apimanagement/rollup.config.js        |   8 +-
 .../src/apiManagementClient.ts                |   4 +-
 .../src/apiManagementClientContext.ts         |  12 +-
 .../arm-apimanagement/src/models/index.ts     | 810 ++++++++++--------
 .../arm-apimanagement/src/models/mappers.ts   | 588 ++++++-------
 .../src/models/parameters.ts                  | 144 ++--
 .../arm-apimanagement/src/operations/api.ts   |  92 +-
 .../src/operations/apiDiagnostic.ts           |  74 +-
 .../src/operations/apiExport.ts               |  14 +-
 .../src/operations/apiIssue.ts                |  72 +-
 .../src/operations/apiIssueAttachment.ts      |  62 +-
 .../src/operations/apiIssueComment.ts         |  62 +-
 .../src/operations/apiManagementOperations.ts |  24 +-
 .../src/operations/apiManagementService.ts    | 122 +--
 .../operations/apiManagementServiceSkus.ts    |  24 +-
 .../src/operations/apiOperation.ts            |  74 +-
 .../src/operations/apiOperationPolicy.ts      |  52 +-
 .../src/operations/apiPolicy.ts               |  52 +-
 .../src/operations/apiProduct.ts              |  22 +-
 .../src/operations/apiRelease.ts              |  74 +-
 .../src/operations/apiRevision.ts             |  22 +-
 .../src/operations/apiSchema.ts               |  62 +-
 .../src/operations/apiTagDescription.ts       |  62 +-
 .../src/operations/apiVersionSet.ts           |  74 +-
 .../src/operations/authorizationServer.ts     |  74 +-
 .../src/operations/backend.ts                 |  86 +-
 .../arm-apimanagement/src/operations/cache.ts |  74 +-
 .../src/operations/certificate.ts             |  62 +-
 .../src/operations/delegationSettings.ts      |  44 +-
 .../src/operations/diagnostic.ts              |  74 +-
 .../src/operations/emailTemplate.ts           |  74 +-
 .../arm-apimanagement/src/operations/group.ts |  74 +-
 .../src/operations/groupUser.ts               |  54 +-
 .../src/operations/identityProvider.ts        |  76 +-
 .../arm-apimanagement/src/operations/issue.ts |  32 +-
 .../src/operations/logger.ts                  |  74 +-
 .../src/operations/networkStatus.ts           |  24 +-
 .../src/operations/notification.ts            |  40 +-
 .../operations/notificationRecipientEmail.ts  |  46 +-
 .../operations/notificationRecipientUser.ts   |  46 +-
 .../src/operations/openIdConnectProvider.ts   |  74 +-
 .../src/operations/operationOperations.ts     |  22 +-
 .../src/operations/policy.ts                  |  52 +-
 .../src/operations/policySnippet.ts           |  12 +-
 .../src/operations/product.ts                 |  92 +-
 .../src/operations/productApi.ts              |  56 +-
 .../src/operations/productGroup.ts            |  56 +-
 .../src/operations/productPolicy.ts           |  52 +-
 .../src/operations/productSubscriptions.ts    |  22 +-
 .../src/operations/property.ts                |  74 +-
 .../src/operations/quotaByCounterKeys.ts      |  26 +-
 .../src/operations/quotaByPeriodKeys.ts       |  26 +-
 .../src/operations/region.ts                  |  24 +-
 .../src/operations/reports.ts                 | 138 +--
 .../src/operations/signInSettings.ts          |  44 +-
 .../src/operations/signUpSettings.ts          |  44 +-
 .../src/operations/subscription.ts            |  98 +--
 .../arm-apimanagement/src/operations/tag.ts   | 254 +++---
 .../src/operations/tagResource.ts             |  22 +-
 .../src/operations/tenantAccess.ts            |  60 +-
 .../src/operations/tenantAccessGit.ts         |  38 +-
 .../src/operations/tenantConfiguration.ts     |  40 +-
 .../arm-apimanagement/src/operations/user.ts  |  94 +-
 .../operations/userConfirmationPassword.ts    |  16 +-
 .../src/operations/userGroup.ts               |  22 +-
 .../src/operations/userIdentities.ts          |  24 +-
 .../src/operations/userSubscription.ts        |  22 +-
 69 files changed, 2567 insertions(+), 2517 deletions(-)

diff --git a/sdk/apimanagement/arm-apimanagement/README.md b/sdk/apimanagement/arm-apimanagement/README.md
index 862f3d10a47b..7abcc247b997 100644
--- a/sdk/apimanagement/arm-apimanagement/README.md
+++ b/sdk/apimanagement/arm-apimanagement/README.md
@@ -26,8 +26,8 @@ npm install @azure/ms-rest-nodeauth
 ##### Sample code
 
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
 import { ApiManagementClient, ApiManagementModels, ApiManagementMappers } from "@azure/arm-apimanagement";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
@@ -68,8 +68,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 <html lang="en">
   <head>
     <title>@azure/arm-apimanagement sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/@azure/core-http/dist/coreHttp.browser.js"></script>
+    <script src="node_modules/@azure/core-arm/dist/coreArm.js"></script>
     <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/arm-apimanagement/dist/arm-apimanagement.js"></script>
     <script type="text/javascript">
@@ -108,3 +108,5 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 ## Related projects
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/apimanagement/arm-apimanagement/README.png)
diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index 3dc6a1e94b14..b3a26bfc5de1 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -4,8 +4,8 @@
   "description": "ApiManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.8.1",
+    "@azure/core-arm": "^1.0.0-preview.1",
+    "@azure/core-http": "^1.0.0-preview.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -26,13 +26,13 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/apimanagement/arm-apimanagement",
   "repository": {
     "type": "git",
-    "url": "https://github.com/azure/azure-sdk-for-js.git"
+    "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
   "bugs": {
-    "url": "https://github.com/azure/azure-sdk-for-js/issues"
+    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
   },
   "files": [
     "dist/**/*.js",
diff --git a/sdk/apimanagement/arm-apimanagement/rollup.config.js b/sdk/apimanagement/arm-apimanagement/rollup.config.js
index dc0dc5622703..90edb8e8a3ff 100644
--- a/sdk/apimanagement/arm-apimanagement/rollup.config.js
+++ b/sdk/apimanagement/arm-apimanagement/rollup.config.js
@@ -8,8 +8,8 @@ import sourcemaps from "rollup-plugin-sourcemaps";
 const config = {
   input: "./esm/apiManagementClient.js",
   external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
+    "@azure/core-http",
+    "@azure/core-arm"
   ],
   output: {
     file: "./dist/arm-apimanagement.js",
@@ -17,8 +17,8 @@ const config = {
     name: "Azure.ArmApimanagement",
     sourcemap: true,
     globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
+      "@azure/core-http": "coreHttp",
+      "@azure/core-arm": "coreArm"
     },
     banner: `/*
  * Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
index 454cda6b424c..3a64af8ce303 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
@@ -86,7 +86,7 @@ class ApiManagementClient extends ApiManagementClientContext {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     super(credentials, subscriptionId, options);
     this.api = new operations.Api(this);
     this.apiRevision = new operations.ApiRevision(this);
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index 0a2d57d4bcfe..220b849ff8d9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -9,14 +9,14 @@
  */
 
 import * as Models from "./models";
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 
 const packageName = "@azure/arm-apimanagement";
 const packageVersion = "5.1.0";
 
-export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
-  credentials: msRest.ServiceClientCredentials;
+export class ApiManagementClientContext extends coreArm.AzureServiceClient {
+  credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials;
   apiVersion?: string;
   subscriptionId: string;
 
@@ -27,7 +27,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
@@ -39,7 +39,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
       options = {};
     }
     if(!options.userAgent) {
-      const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
+      const defaultUserAgent = coreArm.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index f91afeb3611d..27473a3b8b3e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -6,8 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export { BaseResource, CloudError };
 
@@ -2355,13 +2355,31 @@ export interface ApiManagementServiceBaseProperties {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2505,13 +2523,31 @@ export interface ApiManagementServiceResource extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2639,13 +2675,31 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -4407,7 +4461,7 @@ export interface QuotaCounterValueContract {
 /**
  * Optional Parameters.
  */
-export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4440,7 +4494,7 @@ export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4451,7 +4505,7 @@ export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete all revisions of the Api.
    */
@@ -4461,7 +4515,7 @@ export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase
 /**
  * Optional Parameters.
  */
-export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * | Field       | Supported operators    | Supported functions               |
    * |-------------|------------------------|-----------------------------------|
@@ -4492,7 +4546,7 @@ export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiBeginCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4503,7 +4557,7 @@ export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiRevisionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter |
@@ -4523,7 +4577,7 @@ export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le,
@@ -4543,7 +4597,7 @@ export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4554,7 +4608,7 @@ export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4583,7 +4637,7 @@ export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4594,7 +4648,7 @@ export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4604,7 +4658,7 @@ export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4615,7 +4669,7 @@ export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface TagListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4636,7 +4690,7 @@ export interface TagListByOperationOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4657,7 +4711,7 @@ export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface TagListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4678,7 +4732,7 @@ export interface TagListByProductOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4703,7 +4757,7 @@ export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface TagCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4714,7 +4768,7 @@ export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiProductListByApisOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiProductListByApisOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4734,7 +4788,7 @@ export interface ApiProductListByApisOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4744,7 +4798,7 @@ export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4755,7 +4809,7 @@ export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter |
@@ -4775,7 +4829,7 @@ export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4786,7 +4840,7 @@ export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * If true removes all references to the schema before deleting it.
    */
@@ -4796,7 +4850,7 @@ export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4816,7 +4870,7 @@ export interface ApiDiagnosticListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4827,7 +4881,7 @@ export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4853,7 +4907,7 @@ export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Expand the comment attachments.
    */
@@ -4863,7 +4917,7 @@ export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4874,7 +4928,7 @@ export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4895,7 +4949,7 @@ export interface ApiIssueCommentListByServiceOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4906,7 +4960,7 @@ export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.Requ
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4927,7 +4981,7 @@ export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4938,7 +4992,7 @@ export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4959,7 +5013,7 @@ export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4970,7 +5024,7 @@ export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface OperationListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface OperationListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5000,7 +5054,7 @@ export interface OperationListByTagsOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>
@@ -5019,7 +5073,7 @@ export interface ApiVersionSetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5030,7 +5084,7 @@ export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5051,7 +5105,7 @@ export interface AuthorizationServerListByServiceOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5062,7 +5116,7 @@ export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.
 /**
  * Optional Parameters.
  */
-export interface BackendListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5084,7 +5138,7 @@ export interface BackendListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5095,7 +5149,7 @@ export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendReconnectOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Reconnect request parameters.
    */
@@ -5105,7 +5159,7 @@ export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5119,7 +5173,7 @@ export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5130,7 +5184,7 @@ export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface CertificateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5153,7 +5207,7 @@ export interface CertificateListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5164,7 +5218,7 @@ export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5176,7 +5230,7 @@ export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalPar
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5188,7 +5242,7 @@ export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOption
 /**
  * Optional Parameters.
  */
-export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5208,7 +5262,7 @@ export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5219,7 +5273,7 @@ export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5239,7 +5293,7 @@ export interface EmailTemplateListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5250,7 +5304,7 @@ export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5273,7 +5327,7 @@ export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5284,7 +5338,7 @@ export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupUserListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5309,7 +5363,7 @@ export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface IdentityProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5320,7 +5374,7 @@ export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface IssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5345,7 +5399,7 @@ export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface LoggerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5368,7 +5422,7 @@ export interface LoggerListByServiceOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5379,7 +5433,7 @@ export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Force deletion even if diagnostic is attached.
    */
@@ -5389,7 +5443,7 @@ export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface NotificationListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5403,7 +5457,7 @@ export interface NotificationListByServiceOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface NotificationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5414,7 +5468,7 @@ export interface NotificationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5435,7 +5489,7 @@ export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5446,7 +5500,7 @@ export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRes
 /**
  * Optional Parameters.
  */
-export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5456,7 +5510,7 @@ export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5467,7 +5521,7 @@ export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface PolicySnippetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicySnippetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy scope. Possible values include: 'Tenant', 'Product', 'Api', 'Operation', 'All'
    */
@@ -5477,7 +5531,7 @@ export interface PolicySnippetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignInSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5488,7 +5542,7 @@ export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignUpSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5499,7 +5553,7 @@ export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DelegationSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5510,7 +5564,7 @@ export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ProductListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5543,7 +5597,7 @@ export interface ProductListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5554,7 +5608,7 @@ export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete existing subscriptions associated with the product or not.
    */
@@ -5564,7 +5618,7 @@ export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5592,7 +5646,7 @@ export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ProductApiListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductApiListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5617,7 +5671,7 @@ export interface ProductApiListByProductOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ProductGroupListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductGroupListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5638,7 +5692,7 @@ export interface ProductGroupListByProductOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductSubscriptionsListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5665,7 +5719,7 @@ export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5675,7 +5729,7 @@ export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5686,7 +5740,7 @@ export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface PropertyListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le,
@@ -5707,7 +5761,7 @@ export interface PropertyListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5718,7 +5772,7 @@ export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5736,7 +5790,7 @@ export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByUserOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5754,7 +5808,7 @@ export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5772,7 +5826,7 @@ export interface ReportsListByOperationOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5790,7 +5844,7 @@ export interface ReportsListByProductOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByGeoOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5804,7 +5858,7 @@ export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListBySubscriptionOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5822,7 +5876,7 @@ export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByTimeOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5840,7 +5894,7 @@ export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByRequestOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByRequestOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5854,7 +5908,7 @@ export interface ReportsListByRequestOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5881,7 +5935,7 @@ export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5898,7 +5952,7 @@ export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5910,7 +5964,7 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagResourceListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagResourceListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le,
@@ -5942,7 +5996,7 @@ export interface TagResourceListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface UserListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5972,7 +6026,7 @@ export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface UserCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5983,7 +6037,7 @@ export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface UserDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Whether to delete user's subscription or not.
    */
@@ -5997,7 +6051,7 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserGroupListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -6019,7 +6073,7 @@ export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface UserSubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserSubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -7943,7 +7997,7 @@ export type ApiListByServiceResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -7963,7 +8017,7 @@ export type ApiGetEntityTagResponse = ApiGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -7978,7 +8032,7 @@ export type ApiGetResponse = ApiContract & ApiGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8003,7 +8057,7 @@ export type ApiCreateOrUpdateResponse = ApiContract & ApiCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8028,7 +8082,7 @@ export type ApiListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8048,7 +8102,7 @@ export type ApiListByServiceNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8068,7 +8122,7 @@ export type ApiListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8088,7 +8142,7 @@ export type ApiRevisionListByServiceResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8108,7 +8162,7 @@ export type ApiRevisionListByServiceNextResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8128,7 +8182,7 @@ export type ApiReleaseListByServiceResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8148,7 +8202,7 @@ export type ApiReleaseGetEntityTagResponse = ApiReleaseGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8163,7 +8217,7 @@ export type ApiReleaseGetResponse = ApiReleaseContract & ApiReleaseGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8188,7 +8242,7 @@ export type ApiReleaseCreateOrUpdateResponse = ApiReleaseContract & ApiReleaseCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8213,7 +8267,7 @@ export type ApiReleaseListByServiceNextResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8233,7 +8287,7 @@ export type ApiOperationListByApiResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8253,7 +8307,7 @@ export type ApiOperationGetEntityTagResponse = ApiOperationGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8268,7 +8322,7 @@ export type ApiOperationGetResponse = OperationContract & ApiOperationGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8293,7 +8347,7 @@ export type ApiOperationCreateOrUpdateResponse = OperationContract & ApiOperatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8318,7 +8372,7 @@ export type ApiOperationListByApiNextResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8338,7 +8392,7 @@ export type ApiOperationPolicyListByOperationResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8358,7 +8412,7 @@ export type ApiOperationPolicyGetEntityTagResponse = ApiOperationPolicyGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8373,7 +8427,7 @@ export type ApiOperationPolicyGetResponse = PolicyContract & ApiOperationPolicyG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8398,7 +8452,7 @@ export type ApiOperationPolicyCreateOrUpdateResponse = PolicyContract & ApiOpera
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8423,7 +8477,7 @@ export type TagListByOperationResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8443,7 +8497,7 @@ export type TagGetEntityStateByOperationResponse = TagGetEntityStateByOperationH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8458,7 +8512,7 @@ export type TagGetByOperationResponse = TagContract & TagGetByOperationHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8483,7 +8537,7 @@ export type TagAssignToOperationResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8503,7 +8557,7 @@ export type TagListByApiResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8523,7 +8577,7 @@ export type TagGetEntityStateByApiResponse = TagGetEntityStateByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8538,7 +8592,7 @@ export type TagGetByApiResponse = TagContract & TagGetByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8563,7 +8617,7 @@ export type TagAssignToApiResponse = TagContract & TagAssignToApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8588,7 +8642,7 @@ export type TagListByProductResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8608,7 +8662,7 @@ export type TagGetEntityStateByProductResponse = TagGetEntityStateByProductHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8623,7 +8677,7 @@ export type TagGetByProductResponse = TagContract & TagGetByProductHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8648,7 +8702,7 @@ export type TagAssignToProductResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8668,7 +8722,7 @@ export type TagListByServiceResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8688,7 +8742,7 @@ export type TagGetEntityStateResponse = TagGetEntityStateHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8703,7 +8757,7 @@ export type TagGetResponse = TagContract & TagGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8728,7 +8782,7 @@ export type TagCreateOrUpdateResponse = TagContract & TagCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8753,7 +8807,7 @@ export type TagListByOperationNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8773,7 +8827,7 @@ export type TagListByApiNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8793,7 +8847,7 @@ export type TagListByProductNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8813,7 +8867,7 @@ export type TagListByServiceNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8833,7 +8887,7 @@ export type ApiProductListByApisResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8853,7 +8907,7 @@ export type ApiProductListByApisNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8873,7 +8927,7 @@ export type ApiPolicyListByApiResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8893,7 +8947,7 @@ export type ApiPolicyGetEntityTagResponse = ApiPolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8908,7 +8962,7 @@ export type ApiPolicyGetResponse = PolicyContract & ApiPolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8933,7 +8987,7 @@ export type ApiPolicyCreateOrUpdateResponse = PolicyContract & ApiPolicyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8958,7 +9012,7 @@ export type ApiSchemaListByApiResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8978,7 +9032,7 @@ export type ApiSchemaGetEntityTagResponse = ApiSchemaGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8993,7 +9047,7 @@ export type ApiSchemaGetResponse = SchemaContract & ApiSchemaGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9018,7 +9072,7 @@ export type ApiSchemaCreateOrUpdateResponse = SchemaContract & ApiSchemaCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9043,7 +9097,7 @@ export type ApiSchemaListByApiNextResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9063,7 +9117,7 @@ export type ApiDiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9083,7 +9137,7 @@ export type ApiDiagnosticGetEntityTagResponse = ApiDiagnosticGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9098,7 +9152,7 @@ export type ApiDiagnosticGetResponse = DiagnosticContract & ApiDiagnosticGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9123,7 +9177,7 @@ export type ApiDiagnosticCreateOrUpdateResponse = DiagnosticContract & ApiDiagno
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9148,7 +9202,7 @@ export type ApiDiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9168,7 +9222,7 @@ export type ApiIssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9188,7 +9242,7 @@ export type ApiIssueGetEntityTagResponse = ApiIssueGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9203,7 +9257,7 @@ export type ApiIssueGetResponse = IssueContract & ApiIssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9228,7 +9282,7 @@ export type ApiIssueCreateOrUpdateResponse = IssueContract & ApiIssueCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9253,7 +9307,7 @@ export type ApiIssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9273,7 +9327,7 @@ export type ApiIssueCommentListByServiceResponse = IssueCommentCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9293,7 +9347,7 @@ export type ApiIssueCommentGetEntityTagResponse = ApiIssueCommentGetEntityTagHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9308,7 +9362,7 @@ export type ApiIssueCommentGetResponse = IssueCommentContract & ApiIssueCommentG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9333,7 +9387,7 @@ export type ApiIssueCommentCreateOrUpdateResponse = IssueCommentContract & ApiIs
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9358,7 +9412,7 @@ export type ApiIssueCommentListByServiceNextResponse = IssueCommentCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9378,7 +9432,7 @@ export type ApiIssueAttachmentListByServiceResponse = IssueAttachmentCollection
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9398,7 +9452,7 @@ export type ApiIssueAttachmentGetEntityTagResponse = ApiIssueAttachmentGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9413,7 +9467,7 @@ export type ApiIssueAttachmentGetResponse = IssueAttachmentContract & ApiIssueAt
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9438,7 +9492,7 @@ export type ApiIssueAttachmentCreateOrUpdateResponse = IssueAttachmentContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9463,7 +9517,7 @@ export type ApiIssueAttachmentListByServiceNextResponse = IssueAttachmentCollect
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9483,7 +9537,7 @@ export type ApiTagDescriptionListByServiceResponse = TagDescriptionCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9503,7 +9557,7 @@ export type ApiTagDescriptionGetEntityTagResponse = ApiTagDescriptionGetEntityTa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9518,7 +9572,7 @@ export type ApiTagDescriptionGetResponse = TagDescriptionContract & ApiTagDescri
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9543,7 +9597,7 @@ export type ApiTagDescriptionCreateOrUpdateResponse = TagDescriptionContract & A
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9568,7 +9622,7 @@ export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollectio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9588,7 +9642,7 @@ export type OperationListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9608,7 +9662,7 @@ export type OperationListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9628,7 +9682,7 @@ export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9648,7 +9702,7 @@ export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9663,7 +9717,7 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9688,7 +9742,7 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9713,7 +9767,7 @@ export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9733,7 +9787,7 @@ export type AuthorizationServerListByServiceResponse = AuthorizationServerCollec
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9753,7 +9807,7 @@ export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEnti
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9768,7 +9822,7 @@ export type AuthorizationServerGetResponse = AuthorizationServerContract & Autho
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9793,7 +9847,7 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9818,7 +9872,7 @@ export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9838,7 +9892,7 @@ export type BackendListByServiceResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9858,7 +9912,7 @@ export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9873,7 +9927,7 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9898,7 +9952,7 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9923,7 +9977,7 @@ export type BackendListByServiceNextResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9943,7 +9997,7 @@ export type CacheListByServiceResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9963,7 +10017,7 @@ export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9978,7 +10032,7 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10003,7 +10057,7 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10028,7 +10082,7 @@ export type CacheListByServiceNextResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10048,7 +10102,7 @@ export type CertificateListByServiceResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10068,7 +10122,7 @@ export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10083,7 +10137,7 @@ export type CertificateGetResponse = CertificateContract & CertificateGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10108,7 +10162,7 @@ export type CertificateCreateOrUpdateResponse = CertificateContract & Certificat
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10133,7 +10187,7 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10153,7 +10207,7 @@ export type ApiManagementOperationsListResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10173,7 +10227,7 @@ export type ApiManagementOperationsListNextResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10193,7 +10247,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusResponse = ResourceS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10213,7 +10267,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusNextResponse = Resou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10233,7 +10287,7 @@ export type ApiManagementServiceRestoreResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10253,7 +10307,7 @@ export type ApiManagementServiceBackupResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10273,7 +10327,7 @@ export type ApiManagementServiceCreateOrUpdateResponse = ApiManagementServiceRes
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10293,7 +10347,7 @@ export type ApiManagementServiceUpdateResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10313,7 +10367,7 @@ export type ApiManagementServiceGetResponse = ApiManagementServiceResource & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10333,7 +10387,7 @@ export type ApiManagementServiceDeleteMethodResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10353,7 +10407,7 @@ export type ApiManagementServiceListByResourceGroupResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10373,7 +10427,7 @@ export type ApiManagementServiceListResponse = ApiManagementServiceListResult &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10393,7 +10447,7 @@ export type ApiManagementServiceGetSsoTokenResponse = ApiManagementServiceGetSso
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10413,7 +10467,7 @@ export type ApiManagementServiceCheckNameAvailabilityResponse = ApiManagementSer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10433,7 +10487,7 @@ export type ApiManagementServiceApplyNetworkConfigurationUpdatesResponse = ApiMa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10453,7 +10507,7 @@ export type ApiManagementServiceBeginRestoreResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10473,7 +10527,7 @@ export type ApiManagementServiceBeginBackupResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10493,7 +10547,7 @@ export type ApiManagementServiceBeginCreateOrUpdateResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10513,7 +10567,7 @@ export type ApiManagementServiceBeginUpdateResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10533,7 +10587,7 @@ export type ApiManagementServiceBeginDeleteMethodResponse = ApiManagementService
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10553,7 +10607,7 @@ export type ApiManagementServiceBeginApplyNetworkConfigurationUpdatesResponse =
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10573,7 +10627,7 @@ export type ApiManagementServiceListByResourceGroupNextResponse = ApiManagementS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10593,7 +10647,7 @@ export type ApiManagementServiceListNextResponse = ApiManagementServiceListResul
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10613,7 +10667,7 @@ export type DiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10633,7 +10687,7 @@ export type DiagnosticGetEntityTagResponse = DiagnosticGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10648,7 +10702,7 @@ export type DiagnosticGetResponse = DiagnosticContract & DiagnosticGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10673,7 +10727,7 @@ export type DiagnosticCreateOrUpdateResponse = DiagnosticContract & DiagnosticCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10698,7 +10752,7 @@ export type DiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10718,7 +10772,7 @@ export type EmailTemplateListByServiceResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10738,7 +10792,7 @@ export type EmailTemplateGetEntityTagResponse = EmailTemplateGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10753,7 +10807,7 @@ export type EmailTemplateGetResponse = EmailTemplateContract & EmailTemplateGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10778,7 +10832,7 @@ export type EmailTemplateCreateOrUpdateResponse = EmailTemplateContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10798,7 +10852,7 @@ export type EmailTemplateListByServiceNextResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10818,7 +10872,7 @@ export type GroupListByServiceResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10838,7 +10892,7 @@ export type GroupGetEntityTagResponse = GroupGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10853,7 +10907,7 @@ export type GroupGetResponse = GroupContract & GroupGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10878,7 +10932,7 @@ export type GroupCreateOrUpdateResponse = GroupContract & GroupCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10903,7 +10957,7 @@ export type GroupListByServiceNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10923,7 +10977,7 @@ export type GroupUserListResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10948,7 +11002,7 @@ export type GroupUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10968,7 +11022,7 @@ export type GroupUserCreateResponse = UserContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10988,7 +11042,7 @@ export type GroupUserListNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11008,7 +11062,7 @@ export type IdentityProviderListByServiceResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11028,7 +11082,7 @@ export type IdentityProviderGetEntityTagResponse = IdentityProviderGetEntityTagH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11043,7 +11097,7 @@ export type IdentityProviderGetResponse = IdentityProviderContract & IdentityPro
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11068,7 +11122,7 @@ export type IdentityProviderCreateOrUpdateResponse = IdentityProviderContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11093,7 +11147,7 @@ export type IdentityProviderListByServiceNextResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11113,7 +11167,7 @@ export type IssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11133,7 +11187,7 @@ export type IssueGetResponse = IssueContract & IssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11158,7 +11212,7 @@ export type IssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11178,7 +11232,7 @@ export type LoggerListByServiceResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11198,7 +11252,7 @@ export type LoggerGetEntityTagResponse = LoggerGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11213,7 +11267,7 @@ export type LoggerGetResponse = LoggerContract & LoggerGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11238,7 +11292,7 @@ export type LoggerCreateOrUpdateResponse = LoggerContract & LoggerCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11263,7 +11317,7 @@ export type LoggerListByServiceNextResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11283,7 +11337,7 @@ export type NetworkStatusListByServiceResponse = Array<NetworkStatusContractByLo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11303,7 +11357,7 @@ export type NetworkStatusListByLocationResponse = NetworkStatusContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11323,7 +11377,7 @@ export type NotificationListByServiceResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11343,7 +11397,7 @@ export type NotificationGetResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11363,7 +11417,7 @@ export type NotificationCreateOrUpdateResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11383,7 +11437,7 @@ export type NotificationListByServiceNextResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11403,7 +11457,7 @@ export type NotificationRecipientUserListByNotificationResponse = RecipientUserC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11428,7 +11482,7 @@ export type NotificationRecipientUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11448,7 +11502,7 @@ export type NotificationRecipientUserCreateOrUpdateResponse = RecipientUserContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11468,7 +11522,7 @@ export type NotificationRecipientEmailListByNotificationResponse = RecipientEmai
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11493,7 +11547,7 @@ export type NotificationRecipientEmailCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11513,7 +11567,7 @@ export type NotificationRecipientEmailCreateOrUpdateResponse = RecipientEmailCon
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11533,7 +11587,7 @@ export type OpenIdConnectProviderListByServiceResponse = OpenIdConnectProviderCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11553,7 +11607,7 @@ export type OpenIdConnectProviderGetEntityTagResponse = OpenIdConnectProviderGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11568,7 +11622,7 @@ export type OpenIdConnectProviderGetResponse = OpenidConnectProviderContract & O
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11593,7 +11647,7 @@ export type OpenIdConnectProviderCreateOrUpdateResponse = OpenidConnectProviderC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11618,7 +11672,7 @@ export type OpenIdConnectProviderListByServiceNextResponse = OpenIdConnectProvid
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11638,7 +11692,7 @@ export type PolicyListByServiceResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11658,7 +11712,7 @@ export type PolicyGetEntityTagResponse = PolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11673,7 +11727,7 @@ export type PolicyGetResponse = PolicyContract & PolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11698,7 +11752,7 @@ export type PolicyCreateOrUpdateResponse = PolicyContract & PolicyCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11723,7 +11777,7 @@ export type PolicySnippetListByServiceResponse = PolicySnippetsCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11743,7 +11797,7 @@ export type SignInSettingsGetEntityTagResponse = SignInSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11758,7 +11812,7 @@ export type SignInSettingsGetResponse = PortalSigninSettings & SignInSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11783,7 +11837,7 @@ export type SignInSettingsCreateOrUpdateResponse = PortalSigninSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11803,7 +11857,7 @@ export type SignUpSettingsGetEntityTagResponse = SignUpSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11818,7 +11872,7 @@ export type SignUpSettingsGetResponse = PortalSignupSettings & SignUpSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11843,7 +11897,7 @@ export type SignUpSettingsCreateOrUpdateResponse = PortalSignupSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11863,7 +11917,7 @@ export type DelegationSettingsGetEntityTagResponse = DelegationSettingsGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11878,7 +11932,7 @@ export type DelegationSettingsGetResponse = PortalDelegationSettings & Delegatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11903,7 +11957,7 @@ export type DelegationSettingsCreateOrUpdateResponse = PortalDelegationSettings
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11923,7 +11977,7 @@ export type ProductListByServiceResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11943,7 +11997,7 @@ export type ProductGetEntityTagResponse = ProductGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11958,7 +12012,7 @@ export type ProductGetResponse = ProductContract & ProductGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11983,7 +12037,7 @@ export type ProductCreateOrUpdateResponse = ProductContract & ProductCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12008,7 +12062,7 @@ export type ProductListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12028,7 +12082,7 @@ export type ProductListByServiceNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12048,7 +12102,7 @@ export type ProductListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12068,7 +12122,7 @@ export type ProductApiListByProductResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12088,7 +12142,7 @@ export type ProductApiCreateOrUpdateResponse = ApiContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12108,7 +12162,7 @@ export type ProductApiListByProductNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12128,7 +12182,7 @@ export type ProductGroupListByProductResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12148,7 +12202,7 @@ export type ProductGroupCreateOrUpdateResponse = GroupContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12168,7 +12222,7 @@ export type ProductGroupListByProductNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12188,7 +12242,7 @@ export type ProductSubscriptionsListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12208,7 +12262,7 @@ export type ProductSubscriptionsListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12228,7 +12282,7 @@ export type ProductPolicyListByProductResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12248,7 +12302,7 @@ export type ProductPolicyGetEntityTagResponse = ProductPolicyGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12263,7 +12317,7 @@ export type ProductPolicyGetResponse = PolicyContract & ProductPolicyGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12288,7 +12342,7 @@ export type ProductPolicyCreateOrUpdateResponse = PolicyContract & ProductPolicy
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12313,7 +12367,7 @@ export type PropertyListByServiceResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12333,7 +12387,7 @@ export type PropertyGetEntityTagResponse = PropertyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12348,7 +12402,7 @@ export type PropertyGetResponse = PropertyContract & PropertyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12373,7 +12427,7 @@ export type PropertyCreateOrUpdateResponse = PropertyContract & PropertyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12398,7 +12452,7 @@ export type PropertyListByServiceNextResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12418,7 +12472,7 @@ export type QuotaByCounterKeysListByServiceResponse = QuotaCounterCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12438,7 +12492,7 @@ export type QuotaByPeriodKeysGetResponse = QuotaCounterContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12458,7 +12512,7 @@ export type RegionListByServiceResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12478,7 +12532,7 @@ export type RegionListByServiceNextResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12498,7 +12552,7 @@ export type ReportsListByApiResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12518,7 +12572,7 @@ export type ReportsListByUserResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12538,7 +12592,7 @@ export type ReportsListByOperationResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12558,7 +12612,7 @@ export type ReportsListByProductResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12578,7 +12632,7 @@ export type ReportsListByGeoResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12598,7 +12652,7 @@ export type ReportsListBySubscriptionResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12618,7 +12672,7 @@ export type ReportsListByTimeResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12638,7 +12692,7 @@ export type ReportsListByRequestResponse = RequestReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12658,7 +12712,7 @@ export type ReportsListByApiNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12678,7 +12732,7 @@ export type ReportsListByUserNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12698,7 +12752,7 @@ export type ReportsListByOperationNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12718,7 +12772,7 @@ export type ReportsListByProductNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12738,7 +12792,7 @@ export type ReportsListByGeoNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12758,7 +12812,7 @@ export type ReportsListBySubscriptionNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12778,7 +12832,7 @@ export type ReportsListByTimeNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12798,7 +12852,7 @@ export type SubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12818,7 +12872,7 @@ export type SubscriptionGetEntityTagResponse = SubscriptionGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12833,7 +12887,7 @@ export type SubscriptionGetResponse = SubscriptionContract & SubscriptionGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12858,7 +12912,7 @@ export type SubscriptionCreateOrUpdateResponse = SubscriptionContract & Subscrip
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12883,7 +12937,7 @@ export type SubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12903,7 +12957,7 @@ export type TagResourceListByServiceResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12923,7 +12977,7 @@ export type TagResourceListByServiceNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12943,7 +12997,7 @@ export type TenantAccessGetEntityTagResponse = TenantAccessGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12958,7 +13012,7 @@ export type TenantAccessGetResponse = AccessInformationContract & TenantAccessGe
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12983,7 +13037,7 @@ export type TenantAccessGitGetResponse = AccessInformationContract & TenantAcces
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13008,7 +13062,7 @@ export type TenantConfigurationDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13028,7 +13082,7 @@ export type TenantConfigurationSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13048,7 +13102,7 @@ export type TenantConfigurationValidateResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13068,7 +13122,7 @@ export type TenantConfigurationGetSyncStateResponse = TenantConfigurationSyncSta
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13088,7 +13142,7 @@ export type TenantConfigurationBeginDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13108,7 +13162,7 @@ export type TenantConfigurationBeginSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13128,7 +13182,7 @@ export type TenantConfigurationBeginValidateResponse = OperationResultContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13148,7 +13202,7 @@ export type UserListByServiceResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13168,7 +13222,7 @@ export type UserGetEntityTagResponse = UserGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13183,7 +13237,7 @@ export type UserGetResponse = UserContract & UserGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13208,7 +13262,7 @@ export type UserCreateOrUpdateResponse = UserContract & UserCreateOrUpdateHeader
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13233,7 +13287,7 @@ export type UserGenerateSsoUrlResponse = GenerateSsoUrlResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13253,7 +13307,7 @@ export type UserGetSharedAccessTokenResponse = UserTokenResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13273,7 +13327,7 @@ export type UserListByServiceNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13293,7 +13347,7 @@ export type UserGroupListResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13313,7 +13367,7 @@ export type UserGroupListNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13333,7 +13387,7 @@ export type UserSubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13353,7 +13407,7 @@ export type UserSubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13373,7 +13427,7 @@ export type UserIdentitiesListResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13393,7 +13447,7 @@ export type UserIdentitiesListNextResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13413,7 +13467,7 @@ export type ApiExportGetResponse = ApiExportResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 6b65ce34b85f..60dd6c440a4f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -6,13 +6,13 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { CloudErrorMapper, BaseResourceMapper } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
 
-export const ErrorFieldContract: msRest.CompositeMapper = {
+export const ErrorFieldContract: coreHttp.CompositeMapper = {
   serializedName: "ErrorFieldContract",
   type: {
     name: "Composite",
@@ -40,7 +40,7 @@ export const ErrorFieldContract: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponseBody: msRest.CompositeMapper = {
+export const ErrorResponseBody: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponseBody",
   type: {
     name: "Composite",
@@ -74,7 +74,7 @@ export const ErrorResponseBody: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponse: msRest.CompositeMapper = {
+export const ErrorResponse: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponse",
   type: {
     name: "Composite",
@@ -108,7 +108,7 @@ export const ErrorResponse: msRest.CompositeMapper = {
   }
 };
 
-export const RegionContract: msRest.CompositeMapper = {
+export const RegionContract: coreHttp.CompositeMapper = {
   serializedName: "RegionContract",
   type: {
     name: "Composite",
@@ -137,7 +137,7 @@ export const RegionContract: msRest.CompositeMapper = {
   }
 };
 
-export const Resource: msRest.CompositeMapper = {
+export const Resource: coreHttp.CompositeMapper = {
   serializedName: "Resource",
   type: {
     name: "Composite",
@@ -168,7 +168,7 @@ export const Resource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResultValue: msRest.CompositeMapper = {
+export const ApiExportResultValue: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult_value",
   type: {
     name: "Composite",
@@ -184,7 +184,7 @@ export const ApiExportResultValue: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResult: msRest.CompositeMapper = {
+export const ApiExportResult: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult",
   type: {
     name: "Composite",
@@ -213,7 +213,7 @@ export const ApiExportResult: msRest.CompositeMapper = {
   }
 };
 
-export const ProductEntityBaseParameters: msRest.CompositeMapper = {
+export const ProductEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductEntityBaseParameters",
   type: {
     name: "Composite",
@@ -267,7 +267,7 @@ export const ProductEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
+export const ProductTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ProductTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -295,7 +295,7 @@ export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
+export const OperationTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "OperationTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -360,7 +360,7 @@ export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
+export const SubscriptionKeyParameterNamesContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionKeyParameterNamesContract",
   type: {
     name: "Composite",
@@ -382,7 +382,7 @@ export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OpenIdAuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OpenIdAuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -409,7 +409,7 @@ export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OAuth2AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OAuth2AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -431,7 +431,7 @@ export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -461,7 +461,7 @@ export const AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
+export const ApiVersionSetContractDetails: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContractDetails",
   type: {
     name: "Composite",
@@ -507,7 +507,7 @@ export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
+export const ApiCreateOrUpdatePropertiesWsdlSelector: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateProperties_wsdlSelector",
   type: {
     name: "Composite",
@@ -529,7 +529,7 @@ export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
   }
 };
 
-export const ApiEntityBaseContract: msRest.CompositeMapper = {
+export const ApiEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiEntityBaseContract",
   type: {
     name: "Composite",
@@ -627,7 +627,7 @@ export const ApiEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContractProperties: msRest.CompositeMapper = {
+export const ApiContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiContractProperties",
   type: {
     name: "Composite",
@@ -697,7 +697,7 @@ export const ApiContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
+export const ApiTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -759,7 +759,7 @@ export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagTagResourceContractProperties: msRest.CompositeMapper = {
+export const TagTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "TagTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -785,7 +785,7 @@ export const TagTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceContract: msRest.CompositeMapper = {
+export const TagResourceContract: coreHttp.CompositeMapper = {
   serializedName: "TagResourceContract",
   type: {
     name: "Composite",
@@ -824,7 +824,7 @@ export const TagResourceContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagContract: msRest.CompositeMapper = {
+export const TagContract: coreHttp.CompositeMapper = {
   serializedName: "TagContract",
   type: {
     name: "Composite",
@@ -846,7 +846,7 @@ export const TagContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionContract: msRest.CompositeMapper = {
+export const TagDescriptionContract: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionContract",
   type: {
     name: "Composite",
@@ -888,7 +888,7 @@ export const TagDescriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
+export const TagDescriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCreateParameters",
   type: {
     name: "Composite",
@@ -919,7 +919,7 @@ export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentContract: msRest.CompositeMapper = {
+export const IssueAttachmentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentContract",
   type: {
     name: "Composite",
@@ -951,7 +951,7 @@ export const IssueAttachmentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentContract: msRest.CompositeMapper = {
+export const IssueCommentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentContract",
   type: {
     name: "Composite",
@@ -982,7 +982,7 @@ export const IssueCommentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContractBaseProperties: msRest.CompositeMapper = {
+export const IssueContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "IssueContractBaseProperties",
   type: {
     name: "Composite",
@@ -1010,7 +1010,7 @@ export const IssueContractBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const IssueUpdateContract: msRest.CompositeMapper = {
+export const IssueUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "IssueUpdateContract",
   type: {
     name: "Composite",
@@ -1056,7 +1056,7 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContract: msRest.CompositeMapper = {
+export const IssueContract: coreHttp.CompositeMapper = {
   serializedName: "IssueContract",
   type: {
     name: "Composite",
@@ -1106,7 +1106,7 @@ export const IssueContract: msRest.CompositeMapper = {
   }
 };
 
-export const BodyDiagnosticSettings: msRest.CompositeMapper = {
+export const BodyDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "BodyDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1125,7 +1125,7 @@ export const BodyDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const HttpMessageDiagnostic: msRest.CompositeMapper = {
+export const HttpMessageDiagnostic: coreHttp.CompositeMapper = {
   serializedName: "HttpMessageDiagnostic",
   type: {
     name: "Composite",
@@ -1153,7 +1153,7 @@ export const HttpMessageDiagnostic: msRest.CompositeMapper = {
   }
 };
 
-export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
+export const PipelineDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "PipelineDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1177,7 +1177,7 @@ export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SamplingSettings: msRest.CompositeMapper = {
+export const SamplingSettings: coreHttp.CompositeMapper = {
   serializedName: "SamplingSettings",
   type: {
     name: "Composite",
@@ -1203,7 +1203,7 @@ export const SamplingSettings: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticContract: msRest.CompositeMapper = {
+export const DiagnosticContract: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticContract",
   type: {
     name: "Composite",
@@ -1254,7 +1254,7 @@ export const DiagnosticContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaContract: msRest.CompositeMapper = {
+export const SchemaContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaContract",
   type: {
     name: "Composite",
@@ -1278,7 +1278,7 @@ export const SchemaContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
+export const SchemaCreateOrUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaCreateOrUpdateContract",
   type: {
     name: "Composite",
@@ -1302,7 +1302,7 @@ export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyContract: msRest.CompositeMapper = {
+export const PolicyContract: coreHttp.CompositeMapper = {
   serializedName: "PolicyContract",
   type: {
     name: "Composite",
@@ -1327,7 +1327,7 @@ export const PolicyContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCollection: msRest.CompositeMapper = {
+export const PolicyCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicyCollection",
   type: {
     name: "Composite",
@@ -1355,7 +1355,7 @@ export const PolicyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductContract: msRest.CompositeMapper = {
+export const ProductContract: coreHttp.CompositeMapper = {
   serializedName: "ProductContract",
   type: {
     name: "Composite",
@@ -1421,7 +1421,7 @@ export const ProductContract: msRest.CompositeMapper = {
   }
 };
 
-export const ParameterContract: msRest.CompositeMapper = {
+export const ParameterContract: coreHttp.CompositeMapper = {
   serializedName: "ParameterContract",
   type: {
     name: "Composite",
@@ -1474,7 +1474,7 @@ export const ParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const RepresentationContract: msRest.CompositeMapper = {
+export const RepresentationContract: coreHttp.CompositeMapper = {
   serializedName: "RepresentationContract",
   type: {
     name: "Composite",
@@ -1521,7 +1521,7 @@ export const RepresentationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResponseContract: msRest.CompositeMapper = {
+export const ResponseContract: coreHttp.CompositeMapper = {
   serializedName: "ResponseContract",
   type: {
     name: "Composite",
@@ -1568,7 +1568,7 @@ export const ResponseContract: msRest.CompositeMapper = {
   }
 };
 
-export const RequestContract: msRest.CompositeMapper = {
+export const RequestContract: coreHttp.CompositeMapper = {
   serializedName: "RequestContract",
   type: {
     name: "Composite",
@@ -1620,7 +1620,7 @@ export const RequestContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationEntityBaseContract: msRest.CompositeMapper = {
+export const OperationEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "OperationEntityBaseContract",
   type: {
     name: "Composite",
@@ -1676,7 +1676,7 @@ export const OperationEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationUpdateContract: msRest.CompositeMapper = {
+export const OperationUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OperationUpdateContract",
   type: {
     name: "Composite",
@@ -1758,7 +1758,7 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationContract: msRest.CompositeMapper = {
+export const OperationContract: coreHttp.CompositeMapper = {
   serializedName: "OperationContract",
   type: {
     name: "Composite",
@@ -1844,7 +1844,7 @@ export const OperationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseContract: msRest.CompositeMapper = {
+export const ApiReleaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseContract",
   type: {
     name: "Composite",
@@ -1881,7 +1881,7 @@ export const ApiReleaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionContract: msRest.CompositeMapper = {
+export const ApiRevisionContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionContract",
   type: {
     name: "Composite",
@@ -1954,7 +1954,7 @@ export const ApiRevisionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiUpdateContract: msRest.CompositeMapper = {
+export const ApiUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "ApiUpdateContract",
   type: {
     name: "Composite",
@@ -2097,7 +2097,7 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContract: msRest.CompositeMapper = {
+export const ApiContract: coreHttp.CompositeMapper = {
   serializedName: "ApiContract",
   type: {
     name: "Composite",
@@ -2255,7 +2255,7 @@ export const ApiContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateParameter: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateParameter",
   type: {
     name: "Composite",
@@ -2437,7 +2437,7 @@ export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
+export const ApiVersionSetEntityBase: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetEntityBase",
   type: {
     name: "Composite",
@@ -2473,7 +2473,7 @@ export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
+export const ApiVersionSetUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetUpdateParameters",
   type: {
     name: "Composite",
@@ -2525,7 +2525,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContract: msRest.CompositeMapper = {
+export const ApiVersionSetContract: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContract",
   type: {
     name: "Composite",
@@ -2580,7 +2580,7 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
   }
 };
 
-export const TokenBodyParameterContract: msRest.CompositeMapper = {
+export const TokenBodyParameterContract: coreHttp.CompositeMapper = {
   serializedName: "TokenBodyParameterContract",
   type: {
     name: "Composite",
@@ -2604,7 +2604,7 @@ export const TokenBodyParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper = {
+export const AuthorizationServerContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContractBaseProperties",
   type: {
     name: "Composite",
@@ -2711,7 +2711,7 @@ export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper =
   }
 };
 
-export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
+export const AuthorizationServerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerUpdateContract",
   type: {
     name: "Composite",
@@ -2858,7 +2858,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContract: msRest.CompositeMapper = {
+export const AuthorizationServerContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContract",
   type: {
     name: "Composite",
@@ -3010,7 +3010,7 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendReconnectContract: msRest.CompositeMapper = {
+export const BackendReconnectContract: coreHttp.CompositeMapper = {
   serializedName: "BackendReconnectContract",
   type: {
     name: "Composite",
@@ -3027,7 +3027,7 @@ export const BackendReconnectContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendTlsProperties: msRest.CompositeMapper = {
+export const BackendTlsProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendTlsProperties",
   type: {
     name: "Composite",
@@ -3051,7 +3051,7 @@ export const BackendTlsProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProxyContract: msRest.CompositeMapper = {
+export const BackendProxyContract: coreHttp.CompositeMapper = {
   serializedName: "BackendProxyContract",
   type: {
     name: "Composite",
@@ -3084,7 +3084,7 @@ export const BackendProxyContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
+export const BackendAuthorizationHeaderCredentials: coreHttp.CompositeMapper = {
   serializedName: "BackendAuthorizationHeaderCredentials",
   type: {
     name: "Composite",
@@ -3116,7 +3116,7 @@ export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCredentialsContract: msRest.CompositeMapper = {
+export const BackendCredentialsContract: coreHttp.CompositeMapper = {
   serializedName: "BackendCredentialsContract",
   type: {
     name: "Composite",
@@ -3179,7 +3179,7 @@ export const BackendCredentialsContract: msRest.CompositeMapper = {
   }
 };
 
-export const X509CertificateName: msRest.CompositeMapper = {
+export const X509CertificateName: coreHttp.CompositeMapper = {
   serializedName: "X509CertificateName",
   type: {
     name: "Composite",
@@ -3201,7 +3201,7 @@ export const X509CertificateName: msRest.CompositeMapper = {
   }
 };
 
-export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
+export const BackendServiceFabricClusterProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendServiceFabricClusterProperties",
   type: {
     name: "Composite",
@@ -3259,7 +3259,7 @@ export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProperties: msRest.CompositeMapper = {
+export const BackendProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendProperties",
   type: {
     name: "Composite",
@@ -3276,7 +3276,7 @@ export const BackendProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendBaseParameters: msRest.CompositeMapper = {
+export const BackendBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendBaseParameters",
   type: {
     name: "Composite",
@@ -3344,7 +3344,7 @@ export const BackendBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendUpdateParameters: msRest.CompositeMapper = {
+export const BackendUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendUpdateParameters",
   type: {
     name: "Composite",
@@ -3428,7 +3428,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendContract: msRest.CompositeMapper = {
+export const BackendContract: coreHttp.CompositeMapper = {
   serializedName: "BackendContract",
   type: {
     name: "Composite",
@@ -3515,7 +3515,7 @@ export const BackendContract: msRest.CompositeMapper = {
   }
 };
 
-export const CacheUpdateParameters: msRest.CompositeMapper = {
+export const CacheUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CacheUpdateParameters",
   type: {
     name: "Composite",
@@ -3552,7 +3552,7 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const CacheContract: msRest.CompositeMapper = {
+export const CacheContract: coreHttp.CompositeMapper = {
   serializedName: "CacheContract",
   type: {
     name: "Composite",
@@ -3591,7 +3591,7 @@ export const CacheContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateContract: msRest.CompositeMapper = {
+export const CertificateContract: coreHttp.CompositeMapper = {
   serializedName: "CertificateContract",
   type: {
     name: "Composite",
@@ -3623,7 +3623,7 @@ export const CertificateContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CertificateCreateOrUpdateParameters",
   type: {
     name: "Composite",
@@ -3647,7 +3647,7 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSku: msRest.CompositeMapper = {
+export const ResourceSku: coreHttp.CompositeMapper = {
   serializedName: "ResourceSku",
   type: {
     name: "Composite",
@@ -3663,7 +3663,7 @@ export const ResourceSku: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuCapacity: msRest.CompositeMapper = {
+export const ResourceSkuCapacity: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuCapacity",
   type: {
     name: "Composite",
@@ -3701,7 +3701,7 @@ export const ResourceSkuCapacity: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResult: msRest.CompositeMapper = {
+export const ResourceSkuResult: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResult",
   type: {
     name: "Composite",
@@ -3734,7 +3734,7 @@ export const ResourceSkuResult: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateInformation: msRest.CompositeMapper = {
+export const CertificateInformation: coreHttp.CompositeMapper = {
   serializedName: "CertificateInformation",
   type: {
     name: "Composite",
@@ -3765,7 +3765,7 @@ export const CertificateInformation: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateConfiguration: msRest.CompositeMapper = {
+export const CertificateConfiguration: coreHttp.CompositeMapper = {
   serializedName: "CertificateConfiguration",
   type: {
     name: "Composite",
@@ -3801,7 +3801,7 @@ export const CertificateConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const HostnameConfiguration: msRest.CompositeMapper = {
+export const HostnameConfiguration: coreHttp.CompositeMapper = {
   serializedName: "HostnameConfiguration",
   type: {
     name: "Composite",
@@ -3864,7 +3864,7 @@ export const HostnameConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
+export const VirtualNetworkConfiguration: coreHttp.CompositeMapper = {
   serializedName: "VirtualNetworkConfiguration",
   type: {
     name: "Composite",
@@ -3897,7 +3897,7 @@ export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceSkuProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceSkuProperties",
   type: {
     name: "Composite",
@@ -3920,7 +3920,7 @@ export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
   }
 };
 
-export const AdditionalLocation: msRest.CompositeMapper = {
+export const AdditionalLocation: coreHttp.CompositeMapper = {
   serializedName: "AdditionalLocation",
   type: {
     name: "Composite",
@@ -3983,7 +3983,7 @@ export const AdditionalLocation: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceBackupRestoreParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBackupRestoreParameters",
   type: {
     name: "Composite",
@@ -4021,7 +4021,7 @@ export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBaseProperties",
   type: {
     name: "Composite",
@@ -4188,7 +4188,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
+export const ApiManagementServiceIdentity: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceIdentity",
   type: {
     name: "Composite",
@@ -4221,7 +4221,7 @@ export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
   }
 };
 
-export const ApimResource: msRest.CompositeMapper = {
+export const ApimResource: coreHttp.CompositeMapper = {
   serializedName: "ApimResource",
   type: {
     name: "Composite",
@@ -4263,7 +4263,7 @@ export const ApimResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceResource: msRest.CompositeMapper = {
+export const ApiManagementServiceResource: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceResource",
   type: {
     name: "Composite",
@@ -4480,7 +4480,7 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceUpdateParameters",
   type: {
     name: "Composite",
@@ -4687,7 +4687,7 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
+export const ApiManagementServiceGetSsoTokenResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceGetSsoTokenResult",
   type: {
     name: "Composite",
@@ -4703,7 +4703,7 @@ export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceCheckNameAvailabilityParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
   type: {
     name: "Composite",
@@ -4720,7 +4720,7 @@ export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.Composi
   }
 };
 
-export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
+export const ApiManagementServiceNameAvailabilityResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceNameAvailabilityResult",
   type: {
     name: "Composite",
@@ -4755,7 +4755,7 @@ export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceApplyNetworkConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
   type: {
     name: "Composite",
@@ -4771,7 +4771,7 @@ export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.Com
   }
 };
 
-export const OperationDisplay: msRest.CompositeMapper = {
+export const OperationDisplay: coreHttp.CompositeMapper = {
   serializedName: "Operation_display",
   type: {
     name: "Composite",
@@ -4805,7 +4805,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
   }
 };
 
-export const Operation: msRest.CompositeMapper = {
+export const Operation: coreHttp.CompositeMapper = {
   serializedName: "Operation",
   type: {
     name: "Composite",
@@ -4840,7 +4840,7 @@ export const Operation: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
+export const EmailTemplateParametersContractProperties: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateParametersContractProperties",
   type: {
     name: "Composite",
@@ -4882,7 +4882,7 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+export const EmailTemplateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateUpdateParameters",
   type: {
     name: "Composite",
@@ -4935,7 +4935,7 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
+export const EmailTemplateContract: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateContract",
   type: {
     name: "Composite",
@@ -4998,7 +4998,7 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityContract: msRest.CompositeMapper = {
+export const UserIdentityContract: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityContract",
   type: {
     name: "Composite",
@@ -5020,7 +5020,7 @@ export const UserIdentityContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserEntityBaseParameters: msRest.CompositeMapper = {
+export const UserEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "UserEntityBaseParameters",
   type: {
     name: "Composite",
@@ -5055,7 +5055,7 @@ export const UserEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContractProperties: msRest.CompositeMapper = {
+export const GroupContractProperties: coreHttp.CompositeMapper = {
   serializedName: "GroupContractProperties",
   type: {
     name: "Composite",
@@ -5109,7 +5109,7 @@ export const GroupContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const UserContract: msRest.CompositeMapper = {
+export const UserContract: coreHttp.CompositeMapper = {
   serializedName: "UserContract",
   type: {
     name: "Composite",
@@ -5182,7 +5182,7 @@ export const UserContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupUpdateParameters: msRest.CompositeMapper = {
+export const GroupUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
@@ -5225,7 +5225,7 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContract: msRest.CompositeMapper = {
+export const GroupContract: coreHttp.CompositeMapper = {
   serializedName: "GroupContract",
   type: {
     name: "Composite",
@@ -5280,7 +5280,7 @@ export const GroupContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateParameters: msRest.CompositeMapper = {
+export const GroupCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupCreateParameters",
   type: {
     name: "Composite",
@@ -5324,7 +5324,7 @@ export const GroupCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
+export const IdentityProviderBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderBaseParameters",
   type: {
     name: "Composite",
@@ -5396,7 +5396,7 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+export const IdentityProviderUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
@@ -5486,7 +5486,7 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
+export const IdentityProviderContract: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
@@ -5579,7 +5579,7 @@ export const IdentityProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerUpdateContract: msRest.CompositeMapper = {
+export const LoggerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerUpdateContract",
   type: {
     name: "Composite",
@@ -5618,7 +5618,7 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerContract: msRest.CompositeMapper = {
+export const LoggerContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerContract",
   type: {
     name: "Composite",
@@ -5669,7 +5669,7 @@ export const LoggerContract: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityStatusContract: msRest.CompositeMapper = {
+export const ConnectivityStatusContract: coreHttp.CompositeMapper = {
   serializedName: "ConnectivityStatusContract",
   type: {
     name: "Composite",
@@ -5716,7 +5716,7 @@ export const ConnectivityStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContract: msRest.CompositeMapper = {
+export const NetworkStatusContract: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContract",
   type: {
     name: "Composite",
@@ -5751,7 +5751,7 @@ export const NetworkStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
+export const NetworkStatusContractByLocation: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContractByLocation",
   type: {
     name: "Composite",
@@ -5777,7 +5777,7 @@ export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailContract: msRest.CompositeMapper = {
+export const RecipientEmailContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailContract",
   type: {
     name: "Composite",
@@ -5794,7 +5794,7 @@ export const RecipientEmailContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailCollection: msRest.CompositeMapper = {
+export const RecipientEmailCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailCollection",
   type: {
     name: "Composite",
@@ -5822,7 +5822,7 @@ export const RecipientEmailCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserContract: msRest.CompositeMapper = {
+export const RecipientUserContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserContract",
   type: {
     name: "Composite",
@@ -5839,7 +5839,7 @@ export const RecipientUserContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserCollection: msRest.CompositeMapper = {
+export const RecipientUserCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserCollection",
   type: {
     name: "Composite",
@@ -5867,7 +5867,7 @@ export const RecipientUserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientsContractProperties: msRest.CompositeMapper = {
+export const RecipientsContractProperties: coreHttp.CompositeMapper = {
   serializedName: "RecipientsContractProperties",
   type: {
     name: "Composite",
@@ -5899,7 +5899,7 @@ export const RecipientsContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationContract: msRest.CompositeMapper = {
+export const NotificationContract: coreHttp.CompositeMapper = {
   serializedName: "NotificationContract",
   type: {
     name: "Composite",
@@ -5934,7 +5934,7 @@ export const NotificationContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderUpdateContract",
   type: {
     name: "Composite",
@@ -5977,7 +5977,7 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderContract",
   type: {
     name: "Composite",
@@ -6024,7 +6024,7 @@ export const OpenidConnectProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetContract: msRest.CompositeMapper = {
+export const PolicySnippetContract: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetContract",
   type: {
     name: "Composite",
@@ -6062,7 +6062,7 @@ export const PolicySnippetContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetsCollection: msRest.CompositeMapper = {
+export const PolicySnippetsCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetsCollection",
   type: {
     name: "Composite",
@@ -6084,7 +6084,7 @@ export const PolicySnippetsCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper = {
+export const RegistrationDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "RegistrationDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6100,7 +6100,7 @@ export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper = {
+export const SubscriptionsDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionsDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6116,7 +6116,7 @@ export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const PortalDelegationSettings: msRest.CompositeMapper = {
+export const PortalDelegationSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalDelegationSettings",
   type: {
     name: "Composite",
@@ -6153,7 +6153,7 @@ export const PortalDelegationSettings: msRest.CompositeMapper = {
   }
 };
 
-export const TermsOfServiceProperties: msRest.CompositeMapper = {
+export const TermsOfServiceProperties: coreHttp.CompositeMapper = {
   serializedName: "TermsOfServiceProperties",
   type: {
     name: "Composite",
@@ -6181,7 +6181,7 @@ export const TermsOfServiceProperties: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSignupSettings: msRest.CompositeMapper = {
+export const PortalSignupSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSignupSettings",
   type: {
     name: "Composite",
@@ -6205,7 +6205,7 @@ export const PortalSignupSettings: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSigninSettings: msRest.CompositeMapper = {
+export const PortalSigninSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSigninSettings",
   type: {
     name: "Composite",
@@ -6222,7 +6222,7 @@ export const PortalSigninSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionContract: msRest.CompositeMapper = {
+export const SubscriptionContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionContract",
   type: {
     name: "Composite",
@@ -6336,7 +6336,7 @@ export const SubscriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ProductUpdateParameters: msRest.CompositeMapper = {
+export const ProductUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductUpdateParameters",
   type: {
     name: "Composite",
@@ -6400,7 +6400,7 @@ export const ProductUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
+export const PropertyEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyEntityBaseParameters",
   type: {
     name: "Composite",
@@ -6430,7 +6430,7 @@ export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyUpdateParameters: msRest.CompositeMapper = {
+export const PropertyUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyUpdateParameters",
   type: {
     name: "Composite",
@@ -6481,7 +6481,7 @@ export const PropertyUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyContract: msRest.CompositeMapper = {
+export const PropertyContract: coreHttp.CompositeMapper = {
   serializedName: "PropertyContract",
   type: {
     name: "Composite",
@@ -6535,7 +6535,7 @@ export const PropertyContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
+export const QuotaCounterValueContractProperties: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContractProperties",
   type: {
     name: "Composite",
@@ -6557,7 +6557,7 @@ export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterContract: msRest.CompositeMapper = {
+export const QuotaCounterContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterContract",
   type: {
     name: "Composite",
@@ -6608,7 +6608,7 @@ export const QuotaCounterContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterCollection: msRest.CompositeMapper = {
+export const QuotaCounterCollection: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterCollection",
   type: {
     name: "Composite",
@@ -6642,7 +6642,7 @@ export const QuotaCounterCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportRecordContract: msRest.CompositeMapper = {
+export const RequestReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "RequestReportRecordContract",
   type: {
     name: "Composite",
@@ -6762,7 +6762,7 @@ export const RequestReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const ReportRecordContract: msRest.CompositeMapper = {
+export const ReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "ReportRecordContract",
   type: {
     name: "Composite",
@@ -6930,7 +6930,7 @@ export const ReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
+export const SubscriptionUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionUpdateParameters",
   type: {
     name: "Composite",
@@ -7010,7 +7010,7 @@ export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateParameters: msRest.CompositeMapper = {
+export const SubscriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCreateParameters",
   type: {
     name: "Composite",
@@ -7084,7 +7084,7 @@ export const SubscriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateUpdateParameters: msRest.CompositeMapper = {
+export const TagCreateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagCreateUpdateParameters",
   type: {
     name: "Composite",
@@ -7105,7 +7105,7 @@ export const TagCreateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
+export const TenantConfigurationSyncStateContract: coreHttp.CompositeMapper = {
   serializedName: "TenantConfigurationSyncStateContract",
   type: {
     name: "Composite",
@@ -7157,7 +7157,7 @@ export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultLogItemContract: msRest.CompositeMapper = {
+export const OperationResultLogItemContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultLogItemContract",
   type: {
     name: "Composite",
@@ -7185,7 +7185,7 @@ export const OperationResultLogItemContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultContract: msRest.CompositeMapper = {
+export const OperationResultContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultContract",
   type: {
     name: "Composite",
@@ -7251,7 +7251,7 @@ export const OperationResultContract: msRest.CompositeMapper = {
   }
 };
 
-export const DeployConfigurationParameters: msRest.CompositeMapper = {
+export const DeployConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "DeployConfigurationParameters",
   type: {
     name: "Composite",
@@ -7274,7 +7274,7 @@ export const DeployConfigurationParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SaveConfigurationParameter: msRest.CompositeMapper = {
+export const SaveConfigurationParameter: coreHttp.CompositeMapper = {
   serializedName: "SaveConfigurationParameter",
   type: {
     name: "Composite",
@@ -7297,7 +7297,7 @@ export const SaveConfigurationParameter: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationContract: msRest.CompositeMapper = {
+export const AccessInformationContract: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationContract",
   type: {
     name: "Composite",
@@ -7331,7 +7331,7 @@ export const AccessInformationContract: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
+export const AccessInformationUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationUpdateParameters",
   type: {
     name: "Composite",
@@ -7347,7 +7347,7 @@ export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenResult: msRest.CompositeMapper = {
+export const UserTokenResult: coreHttp.CompositeMapper = {
   serializedName: "UserTokenResult",
   type: {
     name: "Composite",
@@ -7363,7 +7363,7 @@ export const UserTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenParameters: msRest.CompositeMapper = {
+export const UserTokenParameters: coreHttp.CompositeMapper = {
   serializedName: "UserTokenParameters",
   type: {
     name: "Composite",
@@ -7392,7 +7392,7 @@ export const UserTokenParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GenerateSsoUrlResult: msRest.CompositeMapper = {
+export const GenerateSsoUrlResult: coreHttp.CompositeMapper = {
   serializedName: "GenerateSsoUrlResult",
   type: {
     name: "Composite",
@@ -7408,7 +7408,7 @@ export const GenerateSsoUrlResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserUpdateParameters: msRest.CompositeMapper = {
+export const UserUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserUpdateParameters",
   type: {
     name: "Composite",
@@ -7479,7 +7479,7 @@ export const UserUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateParameters: msRest.CompositeMapper = {
+export const UserCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserCreateParameters",
   type: {
     name: "Composite",
@@ -7559,7 +7559,7 @@ export const UserCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionInfoContract: msRest.CompositeMapper = {
+export const ApiRevisionInfoContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionInfoContract",
   type: {
     name: "Composite",
@@ -7600,7 +7600,7 @@ export const ApiRevisionInfoContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContract: msRest.CompositeMapper = {
+export const QuotaCounterValueContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContract",
   type: {
     name: "Composite",
@@ -7622,7 +7622,7 @@ export const QuotaCounterValueContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7638,7 +7638,7 @@ export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetHeaders: msRest.CompositeMapper = {
+export const ApiGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-get-headers",
   type: {
     name: "Composite",
@@ -7654,7 +7654,7 @@ export const ApiGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7670,7 +7670,7 @@ export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7686,7 +7686,7 @@ export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-get-headers",
   type: {
     name: "Composite",
@@ -7702,7 +7702,7 @@ export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiReleaseCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7718,7 +7718,7 @@ export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7734,7 +7734,7 @@ export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-get-headers",
   type: {
     name: "Composite",
@@ -7750,7 +7750,7 @@ export const ApiOperationGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7766,7 +7766,7 @@ export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7782,7 +7782,7 @@ export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-get-headers",
   type: {
     name: "Composite",
@@ -7798,7 +7798,7 @@ export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7814,7 +7814,7 @@ export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyoperation-headers",
   type: {
     name: "Composite",
@@ -7830,7 +7830,7 @@ export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyoperation-headers",
   type: {
     name: "Composite",
@@ -7846,7 +7846,7 @@ export const TagGetByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7862,7 +7862,7 @@ export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-get-headers",
   type: {
     name: "Composite",
@@ -7878,7 +7878,7 @@ export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7894,7 +7894,7 @@ export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7910,7 +7910,7 @@ export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-get-headers",
   type: {
     name: "Composite",
@@ -7926,7 +7926,7 @@ export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiSchemaCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7942,7 +7942,7 @@ export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7958,7 +7958,7 @@ export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-get-headers",
   type: {
     name: "Composite",
@@ -7974,7 +7974,7 @@ export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7990,7 +7990,7 @@ export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8006,7 +8006,7 @@ export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-get-headers",
   type: {
     name: "Composite",
@@ -8022,7 +8022,7 @@ export const ApiIssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8038,7 +8038,7 @@ export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8054,7 +8054,7 @@ export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-get-headers",
   type: {
     name: "Composite",
@@ -8070,7 +8070,7 @@ export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8086,7 +8086,7 @@ export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8102,7 +8102,7 @@ export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-get-headers",
   type: {
     name: "Composite",
@@ -8118,7 +8118,7 @@ export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8134,7 +8134,7 @@ export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8150,7 +8150,7 @@ export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-get-headers",
   type: {
     name: "Composite",
@@ -8166,7 +8166,7 @@ export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8182,7 +8182,7 @@ export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyapi-headers",
   type: {
     name: "Composite",
@@ -8198,7 +8198,7 @@ export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByApiHeaders: msRest.CompositeMapper = {
+export const TagGetByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyapi-headers",
   type: {
     name: "Composite",
@@ -8214,7 +8214,7 @@ export const TagGetByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagAssignToApiHeaders: msRest.CompositeMapper = {
+export const TagAssignToApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-assigntoapi-headers",
   type: {
     name: "Composite",
@@ -8230,7 +8230,7 @@ export const TagAssignToApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8246,7 +8246,7 @@ export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-get-headers",
   type: {
     name: "Composite",
@@ -8262,7 +8262,7 @@ export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8278,7 +8278,7 @@ export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8294,7 +8294,7 @@ export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-get-headers",
   type: {
     name: "Composite",
@@ -8310,7 +8310,7 @@ export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8326,7 +8326,7 @@ export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper =
   }
 };
 
-export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
+export const BackendGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8342,7 +8342,7 @@ export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendGetHeaders: msRest.CompositeMapper = {
+export const BackendGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-get-headers",
   type: {
     name: "Composite",
@@ -8358,7 +8358,7 @@ export const BackendGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const BackendCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8374,7 +8374,7 @@ export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CacheGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8390,7 +8390,7 @@ export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetHeaders: msRest.CompositeMapper = {
+export const CacheGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-get-headers",
   type: {
     name: "Composite",
@@ -8406,7 +8406,7 @@ export const CacheGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CacheCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8422,7 +8422,7 @@ export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CertificateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8438,7 +8438,7 @@ export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetHeaders: msRest.CompositeMapper = {
+export const CertificateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-get-headers",
   type: {
     name: "Composite",
@@ -8454,7 +8454,7 @@ export const CertificateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8470,7 +8470,7 @@ export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8486,7 +8486,7 @@ export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-get-headers",
   type: {
     name: "Composite",
@@ -8502,7 +8502,7 @@ export const DiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const DiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8518,7 +8518,7 @@ export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8534,7 +8534,7 @@ export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-get-headers",
   type: {
     name: "Composite",
@@ -8550,7 +8550,7 @@ export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
+export const GroupGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8566,7 +8566,7 @@ export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetHeaders: msRest.CompositeMapper = {
+export const GroupGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-get-headers",
   type: {
     name: "Composite",
@@ -8582,7 +8582,7 @@ export const GroupGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const GroupCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8598,7 +8598,7 @@ export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8614,7 +8614,7 @@ export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-get-headers",
   type: {
     name: "Composite",
@@ -8630,7 +8630,7 @@ export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const IdentityProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8646,7 +8646,7 @@ export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IssueGetHeaders: msRest.CompositeMapper = {
+export const IssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "issue-get-headers",
   type: {
     name: "Composite",
@@ -8662,7 +8662,7 @@ export const IssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const LoggerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8678,7 +8678,7 @@ export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetHeaders: msRest.CompositeMapper = {
+export const LoggerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-get-headers",
   type: {
     name: "Composite",
@@ -8694,7 +8694,7 @@ export const LoggerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const LoggerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8710,7 +8710,7 @@ export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8726,7 +8726,7 @@ export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper =
   }
 };
 
-export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-get-headers",
   type: {
     name: "Composite",
@@ -8742,7 +8742,7 @@ export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8758,7 +8758,7 @@ export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper
   }
 };
 
-export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8774,7 +8774,7 @@ export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyGetHeaders: msRest.CompositeMapper = {
+export const PolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-get-headers",
   type: {
     name: "Composite",
@@ -8790,7 +8790,7 @@ export const PolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8806,7 +8806,7 @@ export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8822,7 +8822,7 @@ export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-get-headers",
   type: {
     name: "Composite",
@@ -8838,7 +8838,7 @@ export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8854,7 +8854,7 @@ export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-get-headers",
   type: {
     name: "Composite",
@@ -8870,7 +8870,7 @@ export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8886,7 +8886,7 @@ export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-get-headers",
   type: {
     name: "Composite",
@@ -8902,7 +8902,7 @@ export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8918,7 +8918,7 @@ export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetHeaders: msRest.CompositeMapper = {
+export const ProductGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-get-headers",
   type: {
     name: "Composite",
@@ -8934,7 +8934,7 @@ export const ProductGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8950,7 +8950,7 @@ export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8966,7 +8966,7 @@ export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-get-headers",
   type: {
     name: "Composite",
@@ -8982,7 +8982,7 @@ export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8998,7 +8998,7 @@ export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyproduct-headers",
   type: {
     name: "Composite",
@@ -9014,7 +9014,7 @@ export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByProductHeaders: msRest.CompositeMapper = {
+export const TagGetByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyproduct-headers",
   type: {
     name: "Composite",
@@ -9030,7 +9030,7 @@ export const TagGetByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PropertyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9046,7 +9046,7 @@ export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetHeaders: msRest.CompositeMapper = {
+export const PropertyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-get-headers",
   type: {
     name: "Composite",
@@ -9062,7 +9062,7 @@ export const PropertyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PropertyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9078,7 +9078,7 @@ export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9094,7 +9094,7 @@ export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-get-headers",
   type: {
     name: "Composite",
@@ -9110,7 +9110,7 @@ export const SubscriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const SubscriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9126,7 +9126,7 @@ export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystate-headers",
   type: {
     name: "Composite",
@@ -9142,7 +9142,7 @@ export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetHeaders: msRest.CompositeMapper = {
+export const TagGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-get-headers",
   type: {
     name: "Composite",
@@ -9158,7 +9158,7 @@ export const TagGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const TagCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9174,7 +9174,7 @@ export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9190,7 +9190,7 @@ export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-get-headers",
   type: {
     name: "Composite",
@@ -9206,7 +9206,7 @@ export const TenantAccessGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGitGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccessgit-get-headers",
   type: {
     name: "Composite",
@@ -9222,7 +9222,7 @@ export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
+export const UserGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9238,7 +9238,7 @@ export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetHeaders: msRest.CompositeMapper = {
+export const UserGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-get-headers",
   type: {
     name: "Composite",
@@ -9254,7 +9254,7 @@ export const UserGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const UserCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9270,7 +9270,7 @@ export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCollection: msRest.CompositeMapper = {
+export const ApiCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiCollection",
   type: {
     name: "Composite",
@@ -9300,7 +9300,7 @@ export const ApiCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceCollection: msRest.CompositeMapper = {
+export const TagResourceCollection: coreHttp.CompositeMapper = {
   serializedName: "TagResourceCollection",
   type: {
     name: "Composite",
@@ -9328,7 +9328,7 @@ export const TagResourceCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionCollection: msRest.CompositeMapper = {
+export const ApiRevisionCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionCollection",
   type: {
     name: "Composite",
@@ -9358,7 +9358,7 @@ export const ApiRevisionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCollection: msRest.CompositeMapper = {
+export const ApiReleaseCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseCollection",
   type: {
     name: "Composite",
@@ -9388,7 +9388,7 @@ export const ApiReleaseCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationCollection: msRest.CompositeMapper = {
+export const OperationCollection: coreHttp.CompositeMapper = {
   serializedName: "OperationCollection",
   type: {
     name: "Composite",
@@ -9418,7 +9418,7 @@ export const OperationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagCollection: msRest.CompositeMapper = {
+export const TagCollection: coreHttp.CompositeMapper = {
   serializedName: "TagCollection",
   type: {
     name: "Composite",
@@ -9446,7 +9446,7 @@ export const TagCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCollection: msRest.CompositeMapper = {
+export const ProductCollection: coreHttp.CompositeMapper = {
   serializedName: "ProductCollection",
   type: {
     name: "Composite",
@@ -9474,7 +9474,7 @@ export const ProductCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCollection: msRest.CompositeMapper = {
+export const SchemaCollection: coreHttp.CompositeMapper = {
   serializedName: "SchemaCollection",
   type: {
     name: "Composite",
@@ -9504,7 +9504,7 @@ export const SchemaCollection: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCollection: msRest.CompositeMapper = {
+export const DiagnosticCollection: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticCollection",
   type: {
     name: "Composite",
@@ -9532,7 +9532,7 @@ export const DiagnosticCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCollection: msRest.CompositeMapper = {
+export const IssueCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCollection",
   type: {
     name: "Composite",
@@ -9562,7 +9562,7 @@ export const IssueCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentCollection: msRest.CompositeMapper = {
+export const IssueCommentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentCollection",
   type: {
     name: "Composite",
@@ -9592,7 +9592,7 @@ export const IssueCommentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentCollection: msRest.CompositeMapper = {
+export const IssueAttachmentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentCollection",
   type: {
     name: "Composite",
@@ -9622,7 +9622,7 @@ export const IssueAttachmentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCollection: msRest.CompositeMapper = {
+export const TagDescriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCollection",
   type: {
     name: "Composite",
@@ -9650,7 +9650,7 @@ export const TagDescriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCollection: msRest.CompositeMapper = {
+export const ApiVersionSetCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetCollection",
   type: {
     name: "Composite",
@@ -9678,7 +9678,7 @@ export const ApiVersionSetCollection: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCollection: msRest.CompositeMapper = {
+export const AuthorizationServerCollection: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerCollection",
   type: {
     name: "Composite",
@@ -9712,7 +9712,7 @@ export const AuthorizationServerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCollection: msRest.CompositeMapper = {
+export const BackendCollection: coreHttp.CompositeMapper = {
   serializedName: "BackendCollection",
   type: {
     name: "Composite",
@@ -9740,7 +9740,7 @@ export const BackendCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCollection: msRest.CompositeMapper = {
+export const CacheCollection: coreHttp.CompositeMapper = {
   serializedName: "CacheCollection",
   type: {
     name: "Composite",
@@ -9768,7 +9768,7 @@ export const CacheCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCollection: msRest.CompositeMapper = {
+export const CertificateCollection: coreHttp.CompositeMapper = {
   serializedName: "CertificateCollection",
   type: {
     name: "Composite",
@@ -9796,7 +9796,7 @@ export const CertificateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationListResult: msRest.CompositeMapper = {
+export const OperationListResult: coreHttp.CompositeMapper = {
   serializedName: "OperationListResult",
   type: {
     name: "Composite",
@@ -9824,7 +9824,7 @@ export const OperationListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResults: msRest.CompositeMapper = {
+export const ResourceSkuResults: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResults",
   type: {
     name: "Composite",
@@ -9853,7 +9853,7 @@ export const ResourceSkuResults: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceListResult: msRest.CompositeMapper = {
+export const ApiManagementServiceListResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceListResult",
   type: {
     name: "Composite",
@@ -9882,7 +9882,7 @@ export const ApiManagementServiceListResult: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateCollection: msRest.CompositeMapper = {
+export const EmailTemplateCollection: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateCollection",
   type: {
     name: "Composite",
@@ -9910,7 +9910,7 @@ export const EmailTemplateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCollection: msRest.CompositeMapper = {
+export const GroupCollection: coreHttp.CompositeMapper = {
   serializedName: "GroupCollection",
   type: {
     name: "Composite",
@@ -9938,7 +9938,7 @@ export const GroupCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserCollection: msRest.CompositeMapper = {
+export const UserCollection: coreHttp.CompositeMapper = {
   serializedName: "UserCollection",
   type: {
     name: "Composite",
@@ -9966,7 +9966,7 @@ export const UserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderList: msRest.CompositeMapper = {
+export const IdentityProviderList: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderList",
   type: {
     name: "Composite",
@@ -9994,7 +9994,7 @@ export const IdentityProviderList: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCollection: msRest.CompositeMapper = {
+export const LoggerCollection: coreHttp.CompositeMapper = {
   serializedName: "LoggerCollection",
   type: {
     name: "Composite",
@@ -10028,7 +10028,7 @@ export const LoggerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationCollection: msRest.CompositeMapper = {
+export const NotificationCollection: coreHttp.CompositeMapper = {
   serializedName: "NotificationCollection",
   type: {
     name: "Composite",
@@ -10056,7 +10056,7 @@ export const NotificationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCollection: coreHttp.CompositeMapper = {
   serializedName: "OpenIdConnectProviderCollection",
   type: {
     name: "Composite",
@@ -10084,7 +10084,7 @@ export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCollection: msRest.CompositeMapper = {
+export const SubscriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCollection",
   type: {
     name: "Composite",
@@ -10112,7 +10112,7 @@ export const SubscriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCollection: msRest.CompositeMapper = {
+export const PropertyCollection: coreHttp.CompositeMapper = {
   serializedName: "PropertyCollection",
   type: {
     name: "Composite",
@@ -10140,7 +10140,7 @@ export const PropertyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegionListResult: msRest.CompositeMapper = {
+export const RegionListResult: coreHttp.CompositeMapper = {
   serializedName: "RegionListResult",
   type: {
     name: "Composite",
@@ -10174,7 +10174,7 @@ export const RegionListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ReportCollection: msRest.CompositeMapper = {
+export const ReportCollection: coreHttp.CompositeMapper = {
   serializedName: "ReportCollection",
   type: {
     name: "Composite",
@@ -10208,7 +10208,7 @@ export const ReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportCollection: msRest.CompositeMapper = {
+export const RequestReportCollection: coreHttp.CompositeMapper = {
   serializedName: "RequestReportCollection",
   type: {
     name: "Composite",
@@ -10236,7 +10236,7 @@ export const RequestReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityCollection: msRest.CompositeMapper = {
+export const UserIdentityCollection: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityCollection",
   type: {
     name: "Composite",
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index b300ade09092..d21da1dce55a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
@@ -8,9 +8,9 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 
-export const acceptLanguage: msRest.OperationParameter = {
+export const acceptLanguage: coreHttp.OperationParameter = {
   parameterPath: "acceptLanguage",
   mapper: {
     serializedName: "accept-language",
@@ -20,7 +20,7 @@ export const acceptLanguage: msRest.OperationParameter = {
     }
   }
 };
-export const accessName: msRest.OperationURLParameter = {
+export const accessName: coreHttp.OperationURLParameter = {
   parameterPath: "accessName",
   mapper: {
     required: true,
@@ -32,7 +32,7 @@ export const accessName: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId0: msRest.OperationURLParameter = {
+export const apiId0: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
@@ -47,22 +47,21 @@ export const apiId0: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId1: msRest.OperationURLParameter = {
+export const apiId1: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
     serializedName: "apiId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const apiVersion: msRest.OperationQueryParameter = {
+export const apiVersion: coreHttp.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
@@ -72,7 +71,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
     }
   }
 };
-export const attachmentId: msRest.OperationURLParameter = {
+export const attachmentId: coreHttp.OperationURLParameter = {
   parameterPath: "attachmentId",
   mapper: {
     required: true,
@@ -87,7 +86,7 @@ export const attachmentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const authsid: msRest.OperationURLParameter = {
+export const authsid: coreHttp.OperationURLParameter = {
   parameterPath: "authsid",
   mapper: {
     required: true,
@@ -102,22 +101,21 @@ export const authsid: msRest.OperationURLParameter = {
     }
   }
 };
-export const backendId: msRest.OperationURLParameter = {
+export const backendId: coreHttp.OperationURLParameter = {
   parameterPath: "backendId",
   mapper: {
     required: true,
     serializedName: "backendId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const cacheId: msRest.OperationURLParameter = {
+export const cacheId: coreHttp.OperationURLParameter = {
   parameterPath: "cacheId",
   mapper: {
     required: true,
@@ -132,7 +130,7 @@ export const cacheId: msRest.OperationURLParameter = {
     }
   }
 };
-export const certificateId: msRest.OperationURLParameter = {
+export const certificateId: coreHttp.OperationURLParameter = {
   parameterPath: "certificateId",
   mapper: {
     required: true,
@@ -147,7 +145,7 @@ export const certificateId: msRest.OperationURLParameter = {
     }
   }
 };
-export const commentId: msRest.OperationURLParameter = {
+export const commentId: coreHttp.OperationURLParameter = {
   parameterPath: "commentId",
   mapper: {
     required: true,
@@ -162,7 +160,7 @@ export const commentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const configurationName: msRest.OperationURLParameter = {
+export const configurationName: coreHttp.OperationURLParameter = {
   parameterPath: "configurationName",
   mapper: {
     required: true,
@@ -174,7 +172,7 @@ export const configurationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const deleteRevisions: msRest.OperationQueryParameter = {
+export const deleteRevisions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteRevisions"
@@ -186,7 +184,7 @@ export const deleteRevisions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const deleteSubscriptions: msRest.OperationQueryParameter = {
+export const deleteSubscriptions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteSubscriptions"
@@ -198,7 +196,7 @@ export const deleteSubscriptions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const diagnosticId: msRest.OperationURLParameter = {
+export const diagnosticId: coreHttp.OperationURLParameter = {
   parameterPath: "diagnosticId",
   mapper: {
     required: true,
@@ -213,7 +211,7 @@ export const diagnosticId: msRest.OperationURLParameter = {
     }
   }
 };
-export const email: msRest.OperationURLParameter = {
+export const email: coreHttp.OperationURLParameter = {
   parameterPath: "email",
   mapper: {
     required: true,
@@ -223,7 +221,7 @@ export const email: msRest.OperationURLParameter = {
     }
   }
 };
-export const expandApiVersionSet: msRest.OperationQueryParameter = {
+export const expandApiVersionSet: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandApiVersionSet"
@@ -235,7 +233,7 @@ export const expandApiVersionSet: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandCommentsAttachments: msRest.OperationQueryParameter = {
+export const expandCommentsAttachments: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandCommentsAttachments"
@@ -247,7 +245,7 @@ export const expandCommentsAttachments: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandGroups: msRest.OperationQueryParameter = {
+export const expandGroups: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandGroups"
@@ -259,7 +257,7 @@ export const expandGroups: msRest.OperationQueryParameter = {
     }
   }
 };
-export const exportParameter: msRest.OperationQueryParameter = {
+export const exportParameter: coreHttp.OperationQueryParameter = {
   parameterPath: "exportParameter",
   mapper: {
     required: true,
@@ -271,7 +269,7 @@ export const exportParameter: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter0: msRest.OperationQueryParameter = {
+export const filter0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "filter"
@@ -283,7 +281,7 @@ export const filter0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter1: msRest.OperationQueryParameter = {
+export const filter1: coreHttp.OperationQueryParameter = {
   parameterPath: "filter",
   mapper: {
     required: true,
@@ -293,7 +291,7 @@ export const filter1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const force: msRest.OperationQueryParameter = {
+export const force: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "force"
@@ -305,7 +303,7 @@ export const force: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format0: msRest.OperationQueryParameter = {
+export const format0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "format"
@@ -318,7 +316,7 @@ export const format0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format1: msRest.OperationQueryParameter = {
+export const format1: coreHttp.OperationQueryParameter = {
   parameterPath: "format",
   mapper: {
     required: true,
@@ -328,22 +326,21 @@ export const format1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const groupId: msRest.OperationURLParameter = {
+export const groupId: coreHttp.OperationURLParameter = {
   parameterPath: "groupId",
   mapper: {
     required: true,
     serializedName: "groupId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const identityProviderName: msRest.OperationURLParameter = {
+export const identityProviderName: coreHttp.OperationURLParameter = {
   parameterPath: "identityProviderName",
   mapper: {
     required: true,
@@ -353,7 +350,7 @@ export const identityProviderName: msRest.OperationURLParameter = {
     }
   }
 };
-export const ifMatch0: msRest.OperationParameter = {
+export const ifMatch0: coreHttp.OperationParameter = {
   parameterPath: [
     "options",
     "ifMatch"
@@ -365,7 +362,7 @@ export const ifMatch0: msRest.OperationParameter = {
     }
   }
 };
-export const ifMatch1: msRest.OperationParameter = {
+export const ifMatch1: coreHttp.OperationParameter = {
   parameterPath: "ifMatch",
   mapper: {
     required: true,
@@ -375,7 +372,7 @@ export const ifMatch1: msRest.OperationParameter = {
     }
   }
 };
-export const includeNotTaggedApis: msRest.OperationQueryParameter = {
+export const includeNotTaggedApis: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedApis"
@@ -387,7 +384,7 @@ export const includeNotTaggedApis: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
+export const includeNotTaggedOperations: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedOperations"
@@ -399,7 +396,7 @@ export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
+export const includeNotTaggedProducts: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedProducts"
@@ -411,7 +408,7 @@ export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
     }
   }
 };
-export const interval: msRest.OperationQueryParameter = {
+export const interval: coreHttp.OperationQueryParameter = {
   parameterPath: "interval",
   mapper: {
     required: true,
@@ -421,7 +418,7 @@ export const interval: msRest.OperationQueryParameter = {
     }
   }
 };
-export const issueId: msRest.OperationURLParameter = {
+export const issueId: coreHttp.OperationURLParameter = {
   parameterPath: "issueId",
   mapper: {
     required: true,
@@ -436,7 +433,7 @@ export const issueId: msRest.OperationURLParameter = {
     }
   }
 };
-export const locationName: msRest.OperationURLParameter = {
+export const locationName: coreHttp.OperationURLParameter = {
   parameterPath: "locationName",
   mapper: {
     required: true,
@@ -449,7 +446,7 @@ export const locationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const loggerId: msRest.OperationURLParameter = {
+export const loggerId: coreHttp.OperationURLParameter = {
   parameterPath: "loggerId",
   mapper: {
     required: true,
@@ -463,7 +460,7 @@ export const loggerId: msRest.OperationURLParameter = {
     }
   }
 };
-export const nextPageLink: msRest.OperationURLParameter = {
+export const nextPageLink: coreHttp.OperationURLParameter = {
   parameterPath: "nextPageLink",
   mapper: {
     required: true,
@@ -474,7 +471,7 @@ export const nextPageLink: msRest.OperationURLParameter = {
   },
   skipEncoding: true
 };
-export const notificationName: msRest.OperationURLParameter = {
+export const notificationName: coreHttp.OperationURLParameter = {
   parameterPath: "notificationName",
   mapper: {
     required: true,
@@ -484,7 +481,7 @@ export const notificationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const notify: msRest.OperationQueryParameter = {
+export const notify: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "notify"
@@ -496,22 +493,21 @@ export const notify: msRest.OperationQueryParameter = {
     }
   }
 };
-export const operationId: msRest.OperationURLParameter = {
+export const operationId: coreHttp.OperationURLParameter = {
   parameterPath: "operationId",
   mapper: {
     required: true,
     serializedName: "operationId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const opid: msRest.OperationURLParameter = {
+export const opid: coreHttp.OperationURLParameter = {
   parameterPath: "opid",
   mapper: {
     required: true,
@@ -525,7 +521,7 @@ export const opid: msRest.OperationURLParameter = {
     }
   }
 };
-export const orderby: msRest.OperationQueryParameter = {
+export const orderby: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "orderby"
@@ -537,7 +533,7 @@ export const orderby: msRest.OperationQueryParameter = {
     }
   }
 };
-export const policyId: msRest.OperationURLParameter = {
+export const policyId: coreHttp.OperationURLParameter = {
   parameterPath: "policyId",
   mapper: {
     required: true,
@@ -549,22 +545,21 @@ export const policyId: msRest.OperationURLParameter = {
     }
   }
 };
-export const productId: msRest.OperationURLParameter = {
+export const productId: coreHttp.OperationURLParameter = {
   parameterPath: "productId",
   mapper: {
     required: true,
     serializedName: "productId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const propId: msRest.OperationURLParameter = {
+export const propId: coreHttp.OperationURLParameter = {
   parameterPath: "propId",
   mapper: {
     required: true,
@@ -578,7 +573,7 @@ export const propId: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaCounterKey: msRest.OperationURLParameter = {
+export const quotaCounterKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaCounterKey",
   mapper: {
     required: true,
@@ -588,7 +583,7 @@ export const quotaCounterKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaPeriodKey: msRest.OperationURLParameter = {
+export const quotaPeriodKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaPeriodKey",
   mapper: {
     required: true,
@@ -598,7 +593,7 @@ export const quotaPeriodKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const releaseId: msRest.OperationURLParameter = {
+export const releaseId: coreHttp.OperationURLParameter = {
   parameterPath: "releaseId",
   mapper: {
     required: true,
@@ -613,7 +608,7 @@ export const releaseId: msRest.OperationURLParameter = {
     }
   }
 };
-export const resourceGroupName: msRest.OperationURLParameter = {
+export const resourceGroupName: coreHttp.OperationURLParameter = {
   parameterPath: "resourceGroupName",
   mapper: {
     required: true,
@@ -623,7 +618,7 @@ export const resourceGroupName: msRest.OperationURLParameter = {
     }
   }
 };
-export const schemaId: msRest.OperationURLParameter = {
+export const schemaId: coreHttp.OperationURLParameter = {
   parameterPath: "schemaId",
   mapper: {
     required: true,
@@ -638,7 +633,7 @@ export const schemaId: msRest.OperationURLParameter = {
     }
   }
 };
-export const scope0: msRest.OperationQueryParameter = {
+export const scope0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -650,7 +645,7 @@ export const scope0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const scope1: msRest.OperationQueryParameter = {
+export const scope1: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -669,7 +664,7 @@ export const scope1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const serviceName: msRest.OperationURLParameter = {
+export const serviceName: coreHttp.OperationURLParameter = {
   parameterPath: "serviceName",
   mapper: {
     required: true,
@@ -684,7 +679,7 @@ export const serviceName: msRest.OperationURLParameter = {
     }
   }
 };
-export const sid: msRest.OperationURLParameter = {
+export const sid: coreHttp.OperationURLParameter = {
   parameterPath: "sid",
   mapper: {
     required: true,
@@ -698,7 +693,7 @@ export const sid: msRest.OperationURLParameter = {
     }
   }
 };
-export const skip: msRest.OperationQueryParameter = {
+export const skip: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "skip"
@@ -713,7 +708,7 @@ export const skip: msRest.OperationQueryParameter = {
     }
   }
 };
-export const subscriptionId: msRest.OperationURLParameter = {
+export const subscriptionId: coreHttp.OperationURLParameter = {
   parameterPath: "subscriptionId",
   mapper: {
     required: true,
@@ -723,7 +718,7 @@ export const subscriptionId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tagId: msRest.OperationURLParameter = {
+export const tagId: coreHttp.OperationURLParameter = {
   parameterPath: "tagId",
   mapper: {
     required: true,
@@ -738,7 +733,7 @@ export const tagId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tags: msRest.OperationQueryParameter = {
+export const tags: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "tags"
@@ -750,7 +745,7 @@ export const tags: msRest.OperationQueryParameter = {
     }
   }
 };
-export const templateName: msRest.OperationURLParameter = {
+export const templateName: coreHttp.OperationURLParameter = {
   parameterPath: "templateName",
   mapper: {
     required: true,
@@ -760,7 +755,7 @@ export const templateName: msRest.OperationURLParameter = {
     }
   }
 };
-export const top: msRest.OperationQueryParameter = {
+export const top: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "top"
@@ -775,22 +770,21 @@ export const top: msRest.OperationQueryParameter = {
     }
   }
 };
-export const userId: msRest.OperationURLParameter = {
+export const userId: coreHttp.OperationURLParameter = {
   parameterPath: "userId",
   mapper: {
     required: true,
     serializedName: "userId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const versionSetId: msRest.OperationURLParameter = {
+export const versionSetId: coreHttp.OperationURLParameter = {
   parameterPath: "versionSetId",
   mapper: {
     required: true,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..62893a65e480 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiMappers";
 import * as Parameters from "../models/parameters";
@@ -40,15 +40,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,9 +162,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -175,7 +175,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -211,9 +211,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -223,7 +223,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,15 +261,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,9 +288,9 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param parameters Create or update parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -337,19 +337,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -361,8 +361,8 @@ export class Api {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis",
   urlParameters: [
@@ -392,7 +392,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -445,7 +445,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -477,7 +477,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -504,7 +504,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apisByTags",
   urlParameters: [
@@ -533,7 +533,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -575,7 +575,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -596,7 +596,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
index aac5ab05ff5e..e4834d6ce0c4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiDiagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiDiagnostic {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -72,7 +72,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,7 +81,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -115,7 +115,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,7 +124,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -134,8 +134,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ export class ApiDiagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -206,9 +206,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -220,7 +220,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -233,8 +233,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -259,9 +259,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -272,7 +272,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -305,19 +305,19 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -329,8 +329,8 @@ export class ApiDiagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics",
   urlParameters: [
@@ -359,7 +359,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -414,7 +414,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -454,7 +454,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -487,7 +487,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -514,7 +514,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
index eccbf4429a22..9ea84a86b30c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiExportMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiExport {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiExportGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class ApiExport {
    * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'Openapi'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class ApiExport {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiExportResult>, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiExportResult>, callback?: coreHttp.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -75,8 +75,8 @@ export class ApiExport {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..527626919d80 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiIssue {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,7 +161,7 @@ export class ApiIssue {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -171,8 +171,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -196,9 +196,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -209,7 +209,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -221,8 +221,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,9 +246,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -258,7 +258,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -269,8 +269,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -290,19 +290,19 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -314,8 +314,8 @@ export class ApiIssue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues",
   urlParameters: [
@@ -345,7 +345,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -401,7 +401,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -474,7 +474,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -501,7 +501,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
index 9392f644c44d..d4098f4441ba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueAttachmentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueAttachment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueAttachment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueAttachment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueAttachment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueAttachment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
index 8f4584a711ee..9938dad7fa57 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueCommentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueComment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueComment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueComment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueComment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueComment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
index 043449470e76..4b4a2370c112 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -31,17 +31,17 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -56,19 +56,19 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -80,8 +80,8 @@ export class ApiManagementOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "providers/Microsoft.ApiManagement/operations",
   queryParameters: [
@@ -101,7 +101,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
index e098f991f33b..4def1deb0c6a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceRestoreResponse>
    */
-  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
+  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
     return this.beginRestore(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceRestoreResponse>;
   }
@@ -52,7 +52,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceBackupResponse>
    */
-  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
+  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
     return this.beginBackup(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceBackupResponse>;
   }
@@ -66,7 +66,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
     return this.beginCreateOrUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceCreateOrUpdateResponse>;
   }
@@ -79,7 +79,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
     return this.beginUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceUpdateResponse>;
   }
@@ -91,21 +91,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceResource>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceResource>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -123,7 +123,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceDeleteMethodResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
     return this.beginDeleteMethod(resourceGroupName,serviceName,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceDeleteMethodResponse>;
   }
@@ -134,19 +134,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupResponse>
    */
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
+  listByResourceGroup(resourceGroupName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,17 +161,17 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -187,21 +187,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetSsoTokenResponse>
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
+  getSsoToken(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,19 +218,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
     return this.client.sendOperationRequest(
       {
         parameters,
@@ -262,9 +262,9 @@ export class ApiManagementService {
    * @param parameters Parameters supplied to the Restore API Management service from backup
    * operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the ApiManagementService_Backup operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -304,9 +304,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -324,9 +324,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -343,9 +343,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -362,9 +362,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -381,19 +381,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>
    */
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
+  listByResourceGroupNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -409,19 +409,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -433,8 +433,8 @@ export class ApiManagementService {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -459,7 +459,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByResourceGroupOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -483,7 +483,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listOperationSpec: msRest.OperationSpec = {
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -506,7 +506,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSsoTokenOperationSpec: msRest.OperationSpec = {
+const getSsoTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/getssotoken",
   urlParameters: [
@@ -531,7 +531,7 @@ const getSsoTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
+const checkNameAvailabilityOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/checkNameAvailability",
   urlParameters: [
@@ -561,7 +561,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginRestoreOperationSpec: msRest.OperationSpec = {
+const beginRestoreOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore",
   urlParameters: [
@@ -594,7 +594,7 @@ const beginRestoreOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginBackupOperationSpec: msRest.OperationSpec = {
+const beginBackupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup",
   urlParameters: [
@@ -627,7 +627,7 @@ const beginBackupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -663,7 +663,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginUpdateOperationSpec: msRest.OperationSpec = {
+const beginUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -696,7 +696,7 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
+const beginDeleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -723,7 +723,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec = {
+const beginApplyNetworkConfigurationUpdatesOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/applynetworkconfigurationupdates",
   urlParameters: [
@@ -756,7 +756,7 @@ const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec =
   serializer
 };
 
-const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -777,7 +777,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
index 4ed93c82e480..4df1cfc2e754 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceSkusMappers";
 import * as Parameters from "../models/parameters";
@@ -34,21 +34,21 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,19 +66,19 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
+  listAvailableServiceSkusNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -90,8 +90,8 @@ export class ApiManagementServiceSkus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listAvailableServiceSkusOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/skus",
   urlParameters: [
@@ -116,7 +116,7 @@ const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listAvailableServiceSkusNextOperationSpec: msRest.OperationSpec = {
+const listAvailableServiceSkusNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
index 02d3a4495eeb..ddffaedd4f02 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiOperation {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiOperation {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,9 +219,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,7 +234,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -248,8 +248,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -275,9 +275,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -289,7 +289,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -323,19 +323,19 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -347,8 +347,8 @@ export class ApiOperation {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations",
   urlParameters: [
@@ -378,7 +378,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -433,7 +433,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -473,7 +473,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -506,7 +506,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -533,7 +533,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
index 7e7f6bd110f5..d88c547584b8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyListByOperationResponse>
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,7 +93,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -104,8 +104,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -150,8 +150,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -187,7 +187,7 @@ export class ApiOperationPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -199,8 +199,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class ApiOperationPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -239,7 +239,7 @@ export class ApiOperationPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -252,8 +252,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,8 +269,8 @@ export class ApiOperationPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies",
   urlParameters: [
@@ -297,7 +297,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -325,7 +325,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -355,7 +355,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -396,7 +396,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
index 4d5ddbc68485..bf30180cb129 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyListByApiResponse>
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ApiPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ApiPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ApiPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ApiPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
index 10e07fb486f2..4c89bf24cdf0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiProductMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiProduct {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiProduct {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiProduct {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiProductListByApisNextResponse>
    */
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
+  listByApisNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiProduct {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApisOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApisOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/products",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByApisOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApisNextOperationSpec: msRest.OperationSpec = {
+const listByApisNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
index f0d3cedeb6d3..5b56128c5d1a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiReleaseMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiRelease {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -51,8 +51,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -83,7 +83,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,8 +93,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -126,7 +126,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -136,8 +136,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,7 +171,7 @@ export class ApiRelease {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -182,8 +182,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -208,9 +208,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -235,8 +235,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,9 +261,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -274,7 +274,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -333,8 +333,8 @@ export class ApiRelease {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases",
   urlParameters: [
@@ -363,7 +363,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -390,7 +390,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -491,7 +491,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -518,7 +518,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
index 837ccbc609f9..7aefdbed97bf 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiRevisionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiRevision {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiRevision {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiRevision {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiRevisionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiRevision {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/revisions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
index da91eb979f4d..5ec72748bd7f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiSchemaMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiSchema {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiSchema {
    * @param parameters The schema contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,9 +218,9 @@ export class ApiSchema {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -232,7 +232,7 @@ export class ApiSchema {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,8 +245,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class ApiSchema {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas",
   urlParameters: [
@@ -320,7 +320,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -347,7 +347,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -375,7 +375,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -415,7 +415,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
index dd13e851c706..7a81f3426756 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiTagDescriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -44,7 +44,7 @@ export class ApiTagDescription {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -53,8 +53,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,7 +85,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,8 +95,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,7 +128,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -138,8 +138,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ApiTagDescription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -184,8 +184,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,9 +209,9 @@ export class ApiTagDescription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiTagDescription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -256,19 +256,19 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -280,8 +280,8 @@ export class ApiTagDescription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions",
   urlParameters: [
@@ -310,7 +310,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -365,7 +365,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -432,7 +432,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
index 5f6861172541..b1c965b849a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiVersionSetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class ApiVersionSet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class ApiVersionSet {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class ApiVersionSet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 8a3182d35653..26d8f5932dac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/authorizationServerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class AuthorizationServer {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class AuthorizationServer {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class AuthorizationServer {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..eb5e19210589 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/backendMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Backend {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetResponse>;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
+  get(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Backend {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Backend {
    * @param backendId Identifier of the Backend entity. Must be unique in the current API Management
    * service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<msRest.RestResponse>;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,19 +321,19 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -345,8 +345,8 @@ export class Backend {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends",
   urlParameters: [
@@ -374,7 +374,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -400,7 +400,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -427,7 +427,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -466,7 +466,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -498,7 +498,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -524,7 +524,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const reconnectOperationSpec: msRest.OperationSpec = {
+const reconnectOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}/reconnect",
   urlParameters: [
@@ -555,7 +555,7 @@ const reconnectOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..0229ff2d39ac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/cacheMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Cache {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetResponse>;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Cache {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Cache {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches",
   urlParameters: [
@@ -333,7 +333,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -359,7 +359,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -425,7 +425,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -457,7 +457,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -483,7 +483,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
index f47a28ce34f4..2cee16d8e3fe 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/certificateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Certificate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Certificate {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,9 +188,9 @@ export class Certificate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -200,7 +200,7 @@ export class Certificate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -211,8 +211,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -231,19 +231,19 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -255,8 +255,8 @@ export class Certificate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates",
   urlParameters: [
@@ -284,7 +284,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -310,7 +310,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -376,7 +376,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -402,7 +402,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
index e1289ca3ddd1..47fe7384cdb0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/delegationSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class DelegationSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class DelegationSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class DelegationSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class DelegationSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..c537d80aeea7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/diagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Diagnostic {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Diagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Diagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..feac8aa81707 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/emailTemplateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class EmailTemplate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,7 +73,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -87,7 +87,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -102,8 +102,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -130,7 +130,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -144,7 +144,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,8 +159,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class EmailTemplate {
    * @param parameters Email Template update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -219,8 +219,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -249,9 +249,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -268,7 +268,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -316,9 +316,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,7 +334,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -351,8 +351,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -371,19 +371,19 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -395,8 +395,8 @@ export class EmailTemplate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates",
   urlParameters: [
@@ -424,7 +424,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -477,7 +477,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -514,7 +514,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -546,7 +546,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -572,7 +572,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..f3e9fed92627 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Group {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetResponse>;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
+  get(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Group {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Group {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
index 819dff540d27..5a1f81e9495c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupUserMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
+  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -111,7 +111,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCreateResponse>
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,7 +119,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -149,9 +149,9 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,7 +159,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -168,8 +168,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,19 +188,19 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -212,8 +212,8 @@ export class GroupUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users",
   urlParameters: [
@@ -242,7 +242,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -268,7 +268,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOperationSpec: msRest.OperationSpec = {
+const createOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -298,7 +298,7 @@ const createOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -324,7 +324,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index a9dc72ce8502..6881b4086f45 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/identityProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class IdentityProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -282,19 +282,19 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -306,8 +306,8 @@ export class IdentityProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders",
   urlParameters: [
@@ -332,7 +332,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -358,7 +358,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -385,7 +385,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -424,7 +424,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -456,7 +456,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -482,7 +482,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
index 74263bc8328b..5bf06e0ce889 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/issueMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Issue {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueGetResponse>;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Issue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -100,19 +100,19 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -124,8 +124,8 @@ export class Issue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues",
   urlParameters: [
@@ -153,7 +153,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues/{issueId}",
   urlParameters: [
@@ -180,7 +180,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
index ceea06065217..d32282984e6c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/loggerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Logger {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Logger {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Logger {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -470,7 +470,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
index 4a2e2f094b53..2e3813915fc3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/networkStatusMappers";
 import * as Parameters from "../models/parameters";
@@ -35,21 +35,21 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByLocationResponse>
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class NetworkStatus {
    * Azure Regions like West US, East US, South Central US.
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class NetworkStatus {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContract>, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContract>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -103,8 +103,8 @@ export class NetworkStatus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/networkstatus",
   urlParameters: [
@@ -140,7 +140,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByLocationOperationSpec: msRest.OperationSpec = {
+const listByLocationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/locations/{locationName}/networkstatus",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
index ee40ffce7f34..de481b030736 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Notification {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -69,7 +69,7 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -90,8 +90,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -135,8 +135,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -154,19 +154,19 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -178,8 +178,8 @@ export class Notification {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications",
   urlParameters: [
@@ -206,7 +206,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -232,7 +232,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -259,7 +259,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
index 33904e45df9c..ebfd03f497fd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientEmailMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailCollection>, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailContract>, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailContract>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param email Email identifier.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientEmail {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
index 0f5df0fb3ac3..0cfc112d1d85 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientUserMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserCollection>, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserContract>, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserContract>, callback?: coreHttp.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
index 6b7772a13ea3..200f347aa0f1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/openIdConnectProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class OpenIdConnectProvider {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class OpenIdConnectProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class OpenIdConnectProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
index 770b86b58870..7338254dd123 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/operationOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class OperationOperations {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class OperationOperations {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class OperationOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.OperationListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class OperationOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operationsByTags",
   urlParameters: [
@@ -126,7 +126,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
index f9736328e80a..b9e89e968493 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policyMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,21 +66,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -104,15 +104,15 @@ export class Policy {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,7 +138,7 @@ export class Policy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -146,8 +146,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class Policy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -176,7 +176,7 @@ export class Policy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -185,8 +185,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,8 +200,8 @@ export class Policy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies",
   urlParameters: [
@@ -226,7 +226,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -252,7 +252,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -280,7 +280,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -319,7 +319,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
index d0ba7845bb1f..74b9659c45b9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policySnippetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class PolicySnippet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicySnippetsCollection>, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PolicySnippetsCollection>, callback?: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -60,8 +60,8 @@ export class PolicySnippet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policySnippets",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
index 31904c098334..173a8de78133 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetResponse>;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Product {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,15 +288,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -313,19 +313,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -341,19 +341,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -365,8 +365,8 @@ export class Product {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products",
   urlParameters: [
@@ -396,7 +396,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -422,7 +422,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -449,7 +449,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -488,7 +488,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -520,7 +520,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -547,7 +547,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/productsByTags",
   urlParameters: [
@@ -576,7 +576,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -597,7 +597,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
index c3bad7380501..29721dc07229 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productApiMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductApi {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,9 +74,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -178,7 +178,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -189,8 +189,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,19 +209,19 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -233,8 +233,8 @@ export class ProductApi {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis",
   urlParameters: [
@@ -263,7 +263,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -318,7 +318,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -344,7 +344,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
index d40911e555c8..67f7c51eda2e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductGroup {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,9 +73,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,7 +84,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,8 +94,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -127,7 +127,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -137,8 +137,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -159,9 +159,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -170,7 +170,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,19 +200,19 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -224,8 +224,8 @@ export class ProductGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups",
   urlParameters: [
@@ -254,7 +254,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -279,7 +279,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -309,7 +309,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -335,7 +335,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
index bd7e68b41ad9..a47a83954212 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyListByProductResponse>
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ProductPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ProductPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ProductPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ProductPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
index df3e0fbae8f6..78ae6452d116 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productSubscriptionsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductSubscriptions {
    * instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductSubscriptions {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class ProductSubscriptions {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductSubscriptionsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class ProductSubscriptions {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/subscriptions",
   urlParameters: [
@@ -125,7 +125,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
index af83fe7a925d..432482302489 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/propertyMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Property {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Property {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Property {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
index e4976fa216f6..06ca471204a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByCounterKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class QuotaByCounterKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByCounterKeysListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterCollection>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,9 +83,9 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,7 +96,7 @@ export class QuotaByCounterKeys {
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -108,8 +108,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class QuotaByCounterKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
@@ -151,7 +151,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..41f8e762396b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByPeriodKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -39,7 +39,7 @@ export class QuotaByPeriodKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByPeriodKeysGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -50,7 +50,7 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -62,8 +62,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterContract>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -87,9 +87,9 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -101,7 +101,7 @@ export class QuotaByPeriodKeys {
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,8 +114,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,8 +131,8 @@ export class QuotaByPeriodKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
@@ -159,7 +159,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
index a563773df876..12217e5f5dd2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/regionMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class Region {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/regions",
   urlParameters: [
@@ -114,7 +114,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
index 328d1f592dab..2f5ab070e0e2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/reportsMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class Reports {
    * @param filter The filter to apply on the operation.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -101,7 +101,7 @@ export class Reports {
    * | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -121,8 +121,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -193,8 +193,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -243,7 +243,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -314,7 +314,7 @@ export class Reports {
    * | </br>
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,8 +334,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -384,7 +384,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -403,8 +403,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -461,7 +461,7 @@ export class Reports {
    * TimeSpan(hours, minutes, seconds)).
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -484,8 +484,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -521,7 +521,7 @@ export class Reports {
    * filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -533,8 +533,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | msRest.ServiceCallback<Models.RequestReportCollection>, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | coreHttp.ServiceCallback<Models.RequestReportCollection>, callback?: coreHttp.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -552,19 +552,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -580,19 +580,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByUserNextResponse>
    */
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
+  listByUserNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -608,19 +608,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -636,19 +636,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -664,19 +664,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByGeoNextResponse>
    */
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
+  listByGeoNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -692,19 +692,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListBySubscriptionNextResponse>
    */
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
+  listBySubscriptionNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -720,19 +720,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByTimeNextResponse>
    */
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
+  listByTimeNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -744,8 +744,8 @@ export class Reports {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byApi",
   urlParameters: [
@@ -774,7 +774,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserOperationSpec: msRest.OperationSpec = {
+const listByUserOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byUser",
   urlParameters: [
@@ -803,7 +803,7 @@ const listByUserOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byOperation",
   urlParameters: [
@@ -832,7 +832,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byProduct",
   urlParameters: [
@@ -861,7 +861,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoOperationSpec: msRest.OperationSpec = {
+const listByGeoOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byGeo",
   urlParameters: [
@@ -889,7 +889,7 @@ const listByGeoOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/bySubscription",
   urlParameters: [
@@ -918,7 +918,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeOperationSpec: msRest.OperationSpec = {
+const listByTimeOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byTime",
   urlParameters: [
@@ -948,7 +948,7 @@ const listByTimeOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByRequestOperationSpec: msRest.OperationSpec = {
+const listByRequestOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byRequest",
   urlParameters: [
@@ -976,7 +976,7 @@ const listByRequestOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -997,7 +997,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserNextOperationSpec: msRest.OperationSpec = {
+const listByUserNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1018,7 +1018,7 @@ const listByUserNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1039,7 +1039,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1060,7 +1060,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoNextOperationSpec: msRest.OperationSpec = {
+const listByGeoNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1081,7 +1081,7 @@ const listByGeoNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1102,7 +1102,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeNextOperationSpec: msRest.OperationSpec = {
+const listByTimeNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
index dd971ea317b3..aa821fe29d3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signInSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignInSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignInSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignInSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignInSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
index bd3214a4dffd..036908e63887 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signUpSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignUpSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignUpSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignUpSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignUpSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
index 630cfbf109fc..c665a6438d1f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/subscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Subscription {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class Subscription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -322,9 +322,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -332,7 +332,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -341,8 +341,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -360,19 +360,19 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -384,8 +384,8 @@ export class Subscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions",
   urlParameters: [
@@ -413,7 +413,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -439,7 +439,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -466,7 +466,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -506,7 +506,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -539,7 +539,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -565,7 +565,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regeneratePrimaryKey",
   urlParameters: [
@@ -589,7 +589,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regenerateSecondaryKey",
   urlParameters: [
@@ -613,7 +613,7 @@ const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..b8b1bf0c9d72 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagMappers";
 import * as Parameters from "../models/parameters";
@@ -47,7 +47,7 @@ export class Tag {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -84,7 +84,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByOperationResponse>
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,7 +95,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -107,8 +107,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -134,7 +134,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByOperationResponse>
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -145,7 +145,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -157,8 +157,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -184,7 +184,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToOperationResponse>
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -195,7 +195,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,8 +207,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -232,9 +232,9 @@ export class Tag {
    * Management service instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,7 +245,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -257,8 +257,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -289,7 +289,7 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -298,8 +298,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,7 +321,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByApiResponse>
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -330,7 +330,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -340,8 +340,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -364,7 +364,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByApiResponse>
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -373,7 +373,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -383,8 +383,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -407,7 +407,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToApiResponse>
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -416,7 +416,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -426,8 +426,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -448,9 +448,9 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -459,7 +459,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -469,8 +469,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -500,7 +500,7 @@ export class Tag {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -509,8 +509,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -532,7 +532,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByProductResponse>
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -541,7 +541,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -551,8 +551,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -575,7 +575,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByProductResponse>
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -584,7 +584,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -594,8 +594,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -618,7 +618,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToProductResponse>
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -627,7 +627,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -637,8 +637,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -659,9 +659,9 @@ export class Tag {
    * instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -670,7 +670,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -680,8 +680,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -707,15 +707,15 @@ export class Tag {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -734,14 +734,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateResponse>
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -749,8 +749,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -770,14 +770,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetResponse>;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -785,8 +785,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
+  get(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -815,7 +815,7 @@ export class Tag {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -824,8 +824,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -847,9 +847,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -859,7 +859,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -870,8 +870,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -893,9 +893,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -904,7 +904,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -914,8 +914,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -934,19 +934,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -962,19 +962,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -990,19 +990,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1018,19 +1018,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1042,8 +1042,8 @@ export class Tag {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags",
   urlParameters: [
@@ -1073,7 +1073,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
+const getEntityStateByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1101,7 +1101,7 @@ const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByOperationOperationSpec: msRest.OperationSpec = {
+const getByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1130,7 +1130,7 @@ const getByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToOperationOperationSpec: msRest.OperationSpec = {
+const assignToOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1161,7 +1161,7 @@ const assignToOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromOperationOperationSpec: msRest.OperationSpec = {
+const detachFromOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1188,7 +1188,7 @@ const detachFromOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiOperationSpec: msRest.OperationSpec = {
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags",
   urlParameters: [
@@ -1217,7 +1217,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
+const getEntityStateByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1244,7 +1244,7 @@ const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByApiOperationSpec: msRest.OperationSpec = {
+const getByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1272,7 +1272,7 @@ const getByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToApiOperationSpec: msRest.OperationSpec = {
+const assignToApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1304,7 +1304,7 @@ const assignToApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromApiOperationSpec: msRest.OperationSpec = {
+const detachFromApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1330,7 +1330,7 @@ const detachFromApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags",
   urlParameters: [
@@ -1359,7 +1359,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
+const getEntityStateByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1386,7 +1386,7 @@ const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByProductOperationSpec: msRest.OperationSpec = {
+const getByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1414,7 +1414,7 @@ const getByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToProductOperationSpec: msRest.OperationSpec = {
+const assignToProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1444,7 +1444,7 @@ const assignToProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromProductOperationSpec: msRest.OperationSpec = {
+const detachFromProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1470,7 +1470,7 @@ const detachFromProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags",
   urlParameters: [
@@ -1499,7 +1499,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateOperationSpec: msRest.OperationSpec = {
+const getEntityStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1525,7 +1525,7 @@ const getEntityStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1552,7 +1552,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1591,7 +1591,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1623,7 +1623,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1649,7 +1649,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1670,7 +1670,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1691,7 +1691,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1712,7 +1712,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
index b662081c7fcb..174b64c28bd7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagResourceMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class TagResource {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class TagResource {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagResourceListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class TagResource {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tagResources",
   urlParameters: [
@@ -117,7 +117,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index 79018f752dfd..f4a53f233db4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class TenantAccess {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class TenantAccess {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class TenantAccess {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,23 +138,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -170,23 +170,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -199,8 +199,8 @@ export class TenantAccess {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -226,7 +226,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -253,7 +253,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -285,7 +285,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regeneratePrimaryKey",
   urlParameters: [
@@ -309,7 +309,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
index c7fbd0f24509..f29079060881 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessGitMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccessGit {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGitGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,23 +63,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -95,23 +95,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class TenantAccessGit {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git",
   urlParameters: [
@@ -152,7 +152,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regeneratePrimaryKey",
   urlParameters: [
@@ -176,7 +176,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
index be1e84173988..fefb4e8f6dd4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantConfigurationMappers";
 import * as Parameters from "../models/parameters";
@@ -36,7 +36,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationDeployResponse>
    */
-  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
+  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
     return this.beginDeploy(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationDeployResponse>;
   }
@@ -50,7 +50,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationSaveResponse>
    */
-  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
+  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
     return this.beginSave(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationSaveResponse>;
   }
@@ -64,7 +64,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationValidateResponse>
    */
-  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
+  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
     return this.beginValidate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationValidateResponse>;
   }
@@ -77,21 +77,21 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationGetSyncStateResponse>
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
+  getSyncState(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -109,9 +109,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Deploy Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -130,9 +130,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Save Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -151,9 +151,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Validate Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -167,8 +167,8 @@ export class TenantConfiguration {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getSyncStateOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getSyncStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/syncState",
   urlParameters: [
@@ -194,7 +194,7 @@ const getSyncStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeployOperationSpec: msRest.OperationSpec = {
+const beginDeployOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/deploy",
   urlParameters: [
@@ -228,7 +228,7 @@ const beginDeployOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginSaveOperationSpec: msRest.OperationSpec = {
+const beginSaveOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/save",
   urlParameters: [
@@ -262,7 +262,7 @@ const beginSaveOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginValidateOperationSpec: msRest.OperationSpec = {
+const beginValidateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/validate",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
index 43a8c279ccc7..3ea13cf17f4d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class User {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetResponse>;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
+  get(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class User {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,14 +269,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGenerateSsoUrlResponse>
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -306,7 +306,7 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetSharedAccessTokenResponse>
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -314,7 +314,7 @@ export class User {
    * @param parameters Create Authorization Token parameters.
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -323,8 +323,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserTokenResult>, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserTokenResult>, callback?: coreHttp.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -343,19 +343,19 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -367,8 +367,8 @@ export class User {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users",
   urlParameters: [
@@ -397,7 +397,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -423,7 +423,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -489,7 +489,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -521,7 +521,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -549,7 +549,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const generateSsoUrlOperationSpec: msRest.OperationSpec = {
+const generateSsoUrlOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl",
   urlParameters: [
@@ -575,7 +575,7 @@ const generateSsoUrlOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
+const getSharedAccessTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token",
   urlParameters: [
@@ -608,7 +608,7 @@ const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
index d9e3dbdaf146..a89f508bb26c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Mappers from "../models/userConfirmationPasswordMappers";
 import * as Parameters from "../models/parameters";
 import { ApiManagementClientContext } from "../apiManagementClientContext";
@@ -31,16 +31,16 @@ export class UserConfirmationPassword {
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,8 +48,8 @@ export class UserConfirmationPassword {
    * @param options The optional parameters
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  send(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,8 +63,8 @@ export class UserConfirmationPassword {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const sendOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const sendOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/confirmations/password/send",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
index 0387dbc52c58..2458f939727f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserGroup {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGroupListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/groups",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
index e84a1e21f620..292ac034ceb2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userIdentitiesMappers";
 import * as Parameters from "../models/parameters";
@@ -34,14 +34,14 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListResponse>
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserIdentities {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserIdentities {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/identities",
   urlParameters: [
@@ -119,7 +119,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
index bf8816577ff9..c75728d78f8f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userSubscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserSubscription {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserSubscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserSubscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserSubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserSubscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",

From 8aad5bec6a003011e86f0c12757f595c0a46c97a Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 29 Jul 2019 10:05:36 -0700
Subject: [PATCH 02/24] Update core-auth to preview.2 (#4471)

---
 common/config/rush/pnpm-lock.yaml | 51 +++++++++++++++++++------------
 sdk/core/core-auth/package.json   |  2 +-
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index b5afb9526bb5..39c60c12f8d7 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -3,6 +3,7 @@ dependencies:
   '@azure/amqp-common': 1.0.0-preview.6_rhea-promise@0.1.15
   '@azure/arm-servicebus': 3.2.0
   '@azure/core-asynciterator-polyfill': 1.0.0-preview.1
+  '@azure/core-auth': 1.0.0-preview.1
   '@azure/core-paging': 1.0.0-preview.1
   '@azure/event-hubs': 2.1.1
   '@azure/logger-js': 1.3.2
@@ -227,6 +228,12 @@ packages:
     dev: false
     resolution:
       integrity: sha512-hMp0y+j/odkAyTa5TYewn4hUlFdEe3sR9uTd2Oq+se61RtuDsqM7UWrNNlyylPyjIENSZHJVWN7jte/jvvMN2Q==
+  /@azure/core-auth/1.0.0-preview.1:
+    dependencies:
+      tslib: 1.10.0
+    dev: false
+    resolution:
+      integrity: sha512-47pHpL+9g4m/cwi1+SplZ0eZfIevwt4F6peD7/t3kK4wa8Q8fOMKcQX967vZ3gpRPvon7/ox8EM+tm1l4UiXbg==
   /@azure/core-paging/1.0.0-preview.1:
     dependencies:
       '@azure/core-asynciterator-polyfill': 1.0.0-preview.1
@@ -9719,12 +9726,13 @@ packages:
     dev: false
     name: '@rush-temp/abort-controller'
     resolution:
-      integrity: sha512-+6kIsx32k7nlN6uAwPS4JOrdVH8CuciXwOqL6DFCDjBdaJhMZ85z/WxMlAtLl/rNxgXlU41Ev3roYTR6U4g+Sw==
+      integrity: sha512-2+IDAPkc8w6F7v+Qtv+0QlKup7BbSj9/FJRqus2Fv6lv4Qwfhhl1dII2Ttv0Y3D1jF0IlqOecuzEef9zxLc/jA==
       tarball: 'file:projects/abort-controller.tgz'
     version: 0.0.0
   'file:projects/core-amqp.tgz':
     dependencies:
       '@azure/abort-controller': 1.0.0-preview.1
+      '@azure/core-auth': 1.0.0-preview.1
       '@types/async-lock': 1.1.1
       '@types/chai': 4.1.7
       '@types/chai-as-promised': 7.1.0
@@ -9789,7 +9797,7 @@ packages:
     dev: false
     name: '@rush-temp/core-amqp'
     resolution:
-      integrity: sha512-VsY0rKG2P16oVijIPCijrhFz7hYGkc7lL/CEXM6RTJ3ls/LGs/E5b8wJuiGiWl1daDPGtc4SPQYBCh9m9VMbPg==
+      integrity: sha512-3d4t4tY50JEufJCuo2xyd4O/T+QoOJARDeDshU+BtuYOwt7z5BTLEk5Oply8pTspZadGEIs+qqhGE/HkQ2ZFxw==
       tarball: 'file:projects/core-amqp.tgz'
     version: 0.0.0
   'file:projects/core-arm.tgz':
@@ -9827,7 +9835,7 @@ packages:
     dev: false
     name: '@rush-temp/core-arm'
     resolution:
-      integrity: sha512-9YUKGvAJqpqJ1OBnZ80TGWf2k5LwlQAWgBpcaxHxAIJ+z3Bb1ZoZFZOMqon7EIRsVNpdAt4M1KVqZSnRv6N2SQ==
+      integrity: sha512-ydCkKGPwdsqk3cZtb5s+PlhnUJNHifGymT1Rh6PjJCVoOOXGTXqZYc4k/EI9DMk/sgI4Vo9cQknrmjG5hRz5dw==
       tarball: 'file:projects/core-arm.tgz'
     version: 0.0.0
   'file:projects/core-asynciterator-polyfill.tgz':
@@ -9846,7 +9854,7 @@ packages:
     dev: false
     name: '@rush-temp/core-asynciterator-polyfill'
     resolution:
-      integrity: sha512-v2OkkGp4BscubKnr7qikdSqLJttDTy5skuwpX+KeQv9H5aMDtfGU4CKUmqdwGsI/+vnXlPU57ZBVJ0BtucQBng==
+      integrity: sha512-oJErNaXrpCzEEVyYVvv8gcBRnv36c76LBxalfW/l4wlABmUh9u+EuvwI46ig0V3m1bmIluW4S/9O08nO18uyGw==
       tarball: 'file:projects/core-asynciterator-polyfill.tgz'
     version: 0.0.0
   'file:projects/core-auth.tgz':
@@ -9886,11 +9894,12 @@ packages:
     dev: false
     name: '@rush-temp/core-auth'
     resolution:
-      integrity: sha512-oIG+pWtdToJ12ubczgGEAYEOBnE88rHXfw4CpDaPYV1DOhdRQ95ZCvcZ1LXAU0ov2OsyOTUrzXq7cl06hmCWUg==
+      integrity: sha512-D6tMjROHeCf7ijXZIPhewnP5sPK7Aj+k5Na5O5OU629HF7qLBczazjTCnpnnex4X8yvi4X3b82rX/LD2OxZ0dQ==
       tarball: 'file:projects/core-auth.tgz'
     version: 0.0.0
   'file:projects/core-http.tgz':
     dependencies:
+      '@azure/core-auth': 1.0.0-preview.1
       '@azure/logger-js': 1.3.2
       '@types/chai': 4.1.7
       '@types/express': 4.17.0
@@ -9968,7 +9977,7 @@ packages:
     dev: false
     name: '@rush-temp/core-http'
     resolution:
-      integrity: sha512-Fycn4IMExj6fHlcivPijmzjgNVpZb3IYFrAHGgrIHOCKi+4Z36IQaI2YsakxKwFmMqFvb2iHX7H2m3gSsp/xcQ==
+      integrity: sha512-pYmI7WimQIGJwIiiOP0xeyV1gSAJfCzUEhrCOVNmG8jvYFqXYUuqHAlGq/N02i+oRh/c+wM07H3Mv/kyCScomQ==
       tarball: 'file:projects/core-http.tgz'
     version: 0.0.0
   'file:projects/core-paging.tgz':
@@ -9988,7 +9997,7 @@ packages:
     dev: false
     name: '@rush-temp/core-paging'
     resolution:
-      integrity: sha512-2u4fno6260w1XLYISrBU+SlPSNrMlY9/Au3oQxjk4EzkWkZXOuDrC9WKNu5w0EHEktYtOi8eX9lAU9+JtZR3Hg==
+      integrity: sha512-MTsl2eG0FXkUyouQVkSEpgLuG6tNUKE8ckhH8y4B3VUevh/MOS/ghpCqXFRKEAMF7jVfB1s2BSSorGYFuWlcDg==
       tarball: 'file:projects/core-paging.tgz'
     version: 0.0.0
   'file:projects/cosmos.tgz':
@@ -10030,7 +10039,7 @@ packages:
     dev: false
     name: '@rush-temp/cosmos'
     resolution:
-      integrity: sha512-f7IyBbSYkZZ+guO7QopSGUb/7d5QYQiotA3hWoIvC0iUo4XhGa+DqlnQ/yn5zx+p8ogWU8pvIixA8GQU4nMUfA==
+      integrity: sha512-rLhtUCCGnwzY3OigHd+TEJ4U0lyBKc2RpjKGMl9koha/aSUchKfm8qHWS+4XO/J2+WldP7yQx6gZY5C+t3cBvQ==
       tarball: 'file:projects/cosmos.tgz'
     version: 0.0.0
   'file:projects/event-hubs.tgz':
@@ -10106,7 +10115,7 @@ packages:
     dev: false
     name: '@rush-temp/event-hubs'
     resolution:
-      integrity: sha512-EZIDJEYo9XVXr67t/WXgRq5lTzd3MTHb9QWJh4W1gSs00mYjvECsUBLR1gaLFUKKgUbxD5LhHCF3RncAnSmwAA==
+      integrity: sha512-0mjQEMP/AVz7oC1IAlNLQ33iz4Nr5+qBaXXYl61l8Xk/jIAgIMhQPZBy1vRj9MzG1dW71rmAVVsK2RSIH7k3uA==
       tarball: 'file:projects/event-hubs.tgz'
     version: 0.0.0
   'file:projects/event-processor-host.tgz':
@@ -10164,7 +10173,7 @@ packages:
     dev: false
     name: '@rush-temp/event-processor-host'
     resolution:
-      integrity: sha512-61Ultc6G27j08ScxQ+P74F49NcOdbgfBBYDyohrr50iQ8TxGI6GX661E6ryHllObZB0NM+r96aChe2W9P/WyCg==
+      integrity: sha512-ArbUM9DPleTcwpTC+4K/0fPHmaYl4POCPoGdwyFmHWq6Jci/i2QUwzKVsRt/g1x/N2QmpX9b1ptBbQbCFo5w4A==
       tarball: 'file:projects/event-processor-host.tgz'
     version: 0.0.0
   'file:projects/identity.tgz':
@@ -10215,7 +10224,7 @@ packages:
     dev: false
     name: '@rush-temp/identity'
     resolution:
-      integrity: sha512-Jo3h3GHu1DGCFEz+zAYytqJfH+CqJGOQJETkQS3KfQeT1zFLHEPA5XEMnczQ4WAqsfYI2d7aJiis57NkuiZUFA==
+      integrity: sha512-aLe+RHGk7M6wqCmNrblNMYMUtng49pfjo7pctPvnPORnPMD3acKp1+Ld3wQaAjImwPxlq60O1eulxRKAGM/fag==
       tarball: 'file:projects/identity.tgz'
     version: 0.0.0
   'file:projects/keyvault-certificates.tgz':
@@ -10244,7 +10253,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-certificates'
     resolution:
-      integrity: sha512-0Rr3TCScxlCMTaQ42DE3wAzan3NPSnborTqYIH8v/tJnxaFbjfD15Z0x2qGdmpn6Rs+45kG26uwKeG14AxtNPA==
+      integrity: sha512-QXnSrcEl4SWcc1wYPRy2BeupDtio52G/miaEJAgse04u88EeU5YoZpQNtZ9l2rzpd/wuJmB2GMkVgUXRnB6zgg==
       tarball: 'file:projects/keyvault-certificates.tgz'
     version: 0.0.0
   'file:projects/keyvault-keys.tgz':
@@ -10313,7 +10322,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-keys'
     resolution:
-      integrity: sha512-1LG76xEV+Au4m4UWojUPbVrOzIRQwUCIFKCat3SnhecAKaclpisUV9jZi0QtMWrdldxyKrpLXv1NoGEO0gKR0A==
+      integrity: sha512-kv1LOiu2pl432/WjarVRLropOwyQrGkOU4tdlA6MiTR9aeysnBosJzkOlScA6HdnBA1rUaoZoILYXQg7x6eS+g==
       tarball: 'file:projects/keyvault-keys.tgz'
     version: 0.0.0
   'file:projects/keyvault-secrets.tgz':
@@ -10382,7 +10391,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-secrets'
     resolution:
-      integrity: sha512-2BkoWHCHM7mwug++tnAJT11TU1o5itq5prJqfjeLOrhrUWieS6GPpwveClcV6CHXGIiZjJ5O0XITdt0/hOPDwA==
+      integrity: sha512-x5m+5BJfn2ssYVl2jzY4YVgvVpgOHP8IQdoFzVG5NlUhYld2DHz4KsEzgYUGdQx5SNud9KLLimjIb4f9FPzSjQ==
       tarball: 'file:projects/keyvault-secrets.tgz'
     version: 0.0.0
   'file:projects/service-bus.tgz':
@@ -10460,7 +10469,7 @@ packages:
     dev: false
     name: '@rush-temp/service-bus'
     resolution:
-      integrity: sha512-CXD8nf7msxREoaGxjqroFnPJ2h685ONI1KTzp3NLawORv7wJy6OD/KtoAlRSW9gvc0njwaRgiM/HihWLsBzivg==
+      integrity: sha512-IckVg8CV310wLgunRCl2OAi+Nvn+GWQsHf3IDe2BoFOc/JzXKqC7/ETh98lua+jyePPL7ycdGhxxzzRCLieFIA==
       tarball: 'file:projects/service-bus.tgz'
     version: 0.0.0
   'file:projects/storage-blob.tgz':
@@ -10531,7 +10540,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-blob'
     resolution:
-      integrity: sha512-rAKd6l+SZnmTB90UeFJ9QuyO+qEENo84HxkI3WDh7jkJoPl4GrKCGqIN4Wa1e6yZTvacXA+0FkXPKPAMoudz7g==
+      integrity: sha512-tGWJWCTrj3/4my2Pij9nPgBj0I9PQSm9p0eCnZ2VRn+LapRqILrmNu5wr51bFfBHeUH9zuqHr1pCP2vunHgf3Q==
       tarball: 'file:projects/storage-blob.tgz'
     version: 0.0.0
   'file:projects/storage-file.tgz':
@@ -10602,7 +10611,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-file'
     resolution:
-      integrity: sha512-KuevB5Q7BkW92XIGBpLmUnLQTFSDLlOdlDHeDQD3Miz7rp+R5xIAypxbzX0g02SoEx6Sn924hUmYy7uEZTc5kQ==
+      integrity: sha512-GjGI/eUKKhovQodQwcjXxpNHSD7J1FK9ewbS0RR5qPFbtlgCxNZuzZqc35tL90gFYb8O+nOc+kS90L6XZ+7mQw==
       tarball: 'file:projects/storage-file.tgz'
     version: 0.0.0
   'file:projects/storage-queue.tgz':
@@ -10672,7 +10681,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-queue'
     resolution:
-      integrity: sha512-RR3iZUa7RTVgQ1nLR61smd8m7nFDZfTXtghHKlJZ+lf/Szae5++8Tpm4edrABKCCNhkzBGzVPZB7xBxklHl7Lw==
+      integrity: sha512-iZiHy2U1uaFwWgPnYPzB68BWV7cFjb3N0jrnWKG39/QVu3JMdlLQzwZ6iyJwBNq3+3qzi+eKQu0TUK0vv+GdUQ==
       tarball: 'file:projects/storage-queue.tgz'
     version: 0.0.0
   'file:projects/template.tgz':
@@ -10724,7 +10733,7 @@ packages:
     dev: false
     name: '@rush-temp/template'
     resolution:
-      integrity: sha512-bkijVcpP7T7f+wl0fsgoWt23POw1yTKtlxF9Zua6ZmN64A80PK2eYV5i3NQ6O8W8GcQ9wEmZembE90TbegjEZQ==
+      integrity: sha512-sI0jpLfbroFiHzPvYDjMrrIveRCsLhD5kuNJoAlJi7dBmdUF9t1x9UraEYF6Br45IIWvH2H0OdwXkQBE+L5Tgw==
       tarball: 'file:projects/template.tgz'
     version: 0.0.0
   'file:projects/testhub.tgz':
@@ -10749,14 +10758,16 @@ packages:
     dev: false
     name: '@rush-temp/testhub'
     resolution:
-      integrity: sha512-uQ91pvb6TuE26BO2DT8IQHUmfgKFtLZ8jywOUsTLTjCFHboNdq5uXcd7+RBY+CSGrnr/CwTs3d262Jt11jj7LA==
+      integrity: sha512-rdhMvXi7mvg+wP0vVdqhouZr17v9a3n4KDMSyuUPU9qhOvY6bMfqoeIXrzgWkCXtR9yjL15gwJHKWsBlByGE4A==
       tarball: 'file:projects/testhub.tgz'
     version: 0.0.0
+registry: ''
 specifiers:
   '@azure/abort-controller': 1.0.0-preview.1
   '@azure/amqp-common': 1.0.0-preview.6
   '@azure/arm-servicebus': ^3.2.0
   '@azure/core-asynciterator-polyfill': 1.0.0-preview.1
+  '@azure/core-auth': 1.0.0-preview.1
   '@azure/core-paging': 1.0.0-preview.1
   '@azure/event-hubs': ^2.1.1
   '@azure/logger-js': ^1.0.2
diff --git a/sdk/core/core-auth/package.json b/sdk/core/core-auth/package.json
index af877825d617..426efaa823e8 100644
--- a/sdk/core/core-auth/package.json
+++ b/sdk/core/core-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure/core-auth",
-  "version": "1.0.0-preview.1",
+  "version": "1.0.0-preview.2",
   "description": "Provides low-level interfaces and helper methods for authentication in Azure SDK",
   "sdk-type": "client",
   "main": "dist/index.js",

From e0c8e190362ff272fc39c1b475bb66c49d6c5534 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 29 Jul 2019 12:07:25 -0700
Subject: [PATCH 03/24]  Update template to depend on core-http (#4437)

- Bundle core-http instead of requiring as external
---
 common/config/rush/pnpm-lock.yaml            | 24 ++++++++++----------
 sdk/template/template/package.json           |  2 +-
 sdk/template/template/review/template.api.md |  2 +-
 sdk/template/template/rollup.base.config.js  |  3 +--
 sdk/template/template/src/index.ts           |  4 ++--
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 39c60c12f8d7..602c19c3062a 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -7,6 +7,7 @@ dependencies:
   '@azure/core-paging': 1.0.0-preview.1
   '@azure/event-hubs': 2.1.1
   '@azure/logger-js': 1.3.2
+  '@azure/ms-rest-js': 2.0.3
   '@azure/ms-rest-nodeauth': 0.9.3
   '@microsoft/api-extractor': 7.3.4
   '@rush-temp/abort-controller': 'file:projects/abort-controller.tgz'
@@ -2174,8 +2175,8 @@ packages:
       integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   /browserslist/3.2.8:
     dependencies:
-      caniuse-lite: 1.0.30000985
-      electron-to-chromium: 1.3.201
+      caniuse-lite: 1.0.30000986
+      electron-to-chromium: 1.3.203
     dev: false
     hasBin: true
     resolution:
@@ -2351,10 +2352,10 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-  /caniuse-lite/1.0.30000985:
+  /caniuse-lite/1.0.30000986:
     dev: false
     resolution:
-      integrity: sha512-1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w==
+      integrity: sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==
   /caseless/0.12.0:
     dev: false
     resolution:
@@ -3224,10 +3225,10 @@ packages:
     dev: false
     resolution:
       integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-  /electron-to-chromium/1.3.201:
+  /electron-to-chromium/1.3.203:
     dev: false
     resolution:
-      integrity: sha512-aCTPIfY1Jvuam5b6vuWRjt1F8i4kY7zX0Qtpu5SNd6l1zjuxU9fDNpbM4o6+oJsra+TMD2o7D20GnkSIgpTr9w==
+      integrity: sha512-Z1FjJKEBhYrCNmnususVk8khiBabVI/bSJB/295V4ghVt4MFmtbP+mXgRZLQZinEBI469U6FtiGgpXnlLs6qiQ==
   /elliptic/6.5.0:
     dependencies:
       bn.js: 4.11.8
@@ -7266,14 +7267,14 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-  /pupa/2.0.0:
+  /pupa/2.0.1:
     dependencies:
       escape-goat: 2.1.0
     dev: false
     engines:
       node: '>=8'
     resolution:
-      integrity: sha512-xxy6mj9KTirR7fpsdXrIaC4oUb/uvFfchrC4K3RFxYLQ/G05RlhJIKFF2ayCQnNaFI+fOxGWzEVUhYMXHNljeQ==
+      integrity: sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==
   /puppeteer/1.19.0:
     dependencies:
       debug: 4.1.1
@@ -7901,7 +7902,7 @@ packages:
     dependencies:
       mkdirp: 0.5.1
       open: 6.4.0
-      pupa: 2.0.0
+      pupa: 2.0.1
       rollup: 1.17.0
       source-map: 0.7.3
     dev: false
@@ -10686,7 +10687,6 @@ packages:
     version: 0.0.0
   'file:projects/template.tgz':
     dependencies:
-      '@azure/ms-rest-js': 1.8.13
       '@microsoft/api-extractor': 7.3.4
       '@types/mocha': 5.2.7
       '@types/node': 8.10.51
@@ -10733,7 +10733,7 @@ packages:
     dev: false
     name: '@rush-temp/template'
     resolution:
-      integrity: sha512-sI0jpLfbroFiHzPvYDjMrrIveRCsLhD5kuNJoAlJi7dBmdUF9t1x9UraEYF6Br45IIWvH2H0OdwXkQBE+L5Tgw==
+      integrity: sha512-aCJAMfdHDb3AD+e4HRiGpK0k0J17hCxw9MbtTZiFmGn65a+yA2M9yEDtF2bAoVCGlM9CjzWzLLUPBdyoNiSevw==
       tarball: 'file:projects/template.tgz'
     version: 0.0.0
   'file:projects/testhub.tgz':
@@ -10761,7 +10761,6 @@ packages:
       integrity: sha512-rdhMvXi7mvg+wP0vVdqhouZr17v9a3n4KDMSyuUPU9qhOvY6bMfqoeIXrzgWkCXtR9yjL15gwJHKWsBlByGE4A==
       tarball: 'file:projects/testhub.tgz'
     version: 0.0.0
-registry: ''
 specifiers:
   '@azure/abort-controller': 1.0.0-preview.1
   '@azure/amqp-common': 1.0.0-preview.6
@@ -10771,6 +10770,7 @@ specifiers:
   '@azure/core-paging': 1.0.0-preview.1
   '@azure/event-hubs': ^2.1.1
   '@azure/logger-js': ^1.0.2
+  '@azure/ms-rest-js': ^2.0.0
   '@azure/ms-rest-nodeauth': ^0.9.2
   '@microsoft/api-extractor': ^7.1.5
   '@rush-temp/abort-controller': 'file:./projects/abort-controller.tgz'
diff --git a/sdk/template/template/package.json b/sdk/template/template/package.json
index 3e632f1d9af6..a91f1cf8762a 100644
--- a/sdk/template/template/package.json
+++ b/sdk/template/template/package.json
@@ -60,7 +60,7 @@
   "sideEffects": false,
   "private": true,
   "dependencies": {
-    "@azure/ms-rest-js": "^1.8.1",
+    "@azure/core-http": "1.0.0-preview.2",
     "events": "^3.0.0",
     "tslib": "^1.9.3"
   },
diff --git a/sdk/template/template/review/template.api.md b/sdk/template/template/review/template.api.md
index dded12fcad14..d07e84db6409 100644
--- a/sdk/template/template/review/template.api.md
+++ b/sdk/template/template/review/template.api.md
@@ -5,7 +5,7 @@
 ```ts
 
 import EventEmitter from 'events';
-import { URLBuilder } from '@azure/ms-rest-js';
+import { URLBuilder } from '@azure/core-http';
 
 // @public (undocumented)
 export function createEventEmitter(): EventEmitter;
diff --git a/sdk/template/template/rollup.base.config.js b/sdk/template/template/rollup.base.config.js
index 76a4d7ecb8af..067d58d3a9c5 100644
--- a/sdk/template/template/rollup.base.config.js
+++ b/sdk/template/template/rollup.base.config.js
@@ -58,13 +58,12 @@ export function nodeConfig(test = false) {
 export function browserConfig(test = false, production = false) {
   const baseConfig = {
     input: input,
-    external: ["@azure/ms-rest-js"],
     output: {
       file: "browser/azure-template.js",
       format: "umd",
       name: "ExampleClient",
       sourcemap: true,
-      globals: { "@azure/ms-rest-js": "msRest" }
+      globals: { "@azure/core-http": "Azure.Core.HTTP" }
     },
     preserveSymlinks: false,
     plugins: [
diff --git a/sdk/template/template/src/index.ts b/sdk/template/template/src/index.ts
index 6b6105dcf980..28b5d6c1dbd8 100644
--- a/sdk/template/template/src/index.ts
+++ b/sdk/template/template/src/index.ts
@@ -7,10 +7,10 @@ export { print };
 
 // this is a utility function from a library that should be external
 // for both node and web
-import { isNode } from "@azure/ms-rest-js";
+import { isNode } from "@azure/core-http";
 
 // exporting some value from a dependency
-export { URLBuilder } from "@azure/ms-rest-js";
+export { URLBuilder } from "@azure/core-http";
 
 export function createEventEmitter() {
   // use event emitter

From 0f8df321fe3d40282c9b75084308d2911885eab5 Mon Sep 17 00:00:00 2001
From: Ramya Rao <ramyar@microsoft.com>
Date: Mon, 29 Jul 2019 13:21:00 -0700
Subject: [PATCH 04/24] Update codeowners file for js (#4475)

---
 .github/CODEOWNERS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 633227e8a258..ad5dc8aaf1cb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,17 +9,17 @@
 /sdk/ @ramya-rao-a
 
 # Core
-/sdk/core/abort-controller/ @daviwil
-/sdk/core/core-amqp/ @ramya-rao-a
+/sdk/core/abort-controller/ @chradek
+/sdk/core/core-amqp/ @ramya-rao-a @chradek @shivangireja
 /sdk/core/core-auth/ @daviwil
 /sdk/core/core-http/ @daviwil
 /sdk/core/core-paging/ @daviwil
 
 # Service teams
-/sdk/eventhub/ @chradek @shivangireja
-/sdk/servicebus/ @ramya-rao-a @shivangireja
+/sdk/eventhub/ @ramya-rao-a @chradek @shivangireja
+/sdk/servicebus/ @ramya-rao-a @chradek @shivangireja
 
-/sdk/identity/ @daviwil
+/sdk/identity/ @daviwil @jonathandturner
 /sdk/keyvault/ @jonathandturner @sadasant
 /sdk/storage/ @XiaoningLiu @jeremymeng @HarshaNalluru @vinjiang @jiacfan
 

From e2763dbb540b742133f6d95f721c27681c7b99bc Mon Sep 17 00:00:00 2001
From: ramya0820 <45977823+ramya0820@users.noreply.github.com>
Date: Mon, 29 Jul 2019 16:35:03 -0700
Subject: [PATCH 05/24] [Event Hubs] Perform sendRequest() operation handling
 from SDK (#4322)

---
 sdk/core/core-amqp/changelog.md               |   4 +
 sdk/core/core-amqp/src/requestResponseLink.ts | 281 ++++++++----------
 .../core-amqp/test/requestResponse.spec.ts    | 105 +++----
 .../event-hubs/src/managementClient.ts        | 150 ++++++++--
 4 files changed, 303 insertions(+), 237 deletions(-)

diff --git a/sdk/core/core-amqp/changelog.md b/sdk/core/core-amqp/changelog.md
index f27c5b4c337d..6fe74f59aed4 100644
--- a/sdk/core/core-amqp/changelog.md
+++ b/sdk/core/core-amqp/changelog.md
@@ -1,3 +1,7 @@
+## 1.0.0-preview.2.0 - Coming soon...
+
+- `sendRequest()` function in the `RequestResponseLink` now excludes default retries and leaves it up to the users to implement it as necessary.
+
 ## 1.0.0-preview.1.0 - 28th June, 2019
 
 This library is based off of the [@azure/amqp-common](https://www.npmjs.com/package/@azure/amqp-common)
diff --git a/sdk/core/core-amqp/src/requestResponseLink.ts b/sdk/core/core-amqp/src/requestResponseLink.ts
index 1b3e18a25b87..e7fa21cf4576 100644
--- a/sdk/core/core-amqp/src/requestResponseLink.ts
+++ b/sdk/core/core-amqp/src/requestResponseLink.ts
@@ -3,7 +3,6 @@
 
 import { AbortSignalLike, AbortError } from "@azure/abort-controller";
 import * as Constants from "./util/constants";
-import { retry, RetryConfig, RetryOperationType } from "./retry";
 import {
   Session,
   Connection,
@@ -15,8 +14,7 @@ import {
   SenderOptions,
   ReceiverOptions,
   ReceiverEvents,
-  ReqResLink,
-  generate_uuid
+  ReqResLink
 } from "rhea-promise";
 import { translate, ConditionStatusMapper } from "./errors";
 import * as log from "./log";
@@ -32,19 +30,9 @@ export interface SendRequestOptions {
   abortSignal?: AbortSignalLike;
   /**
    * @property {number} [timeoutInSeconds] Max time to wait for the operation to complete.
-   * Default: `10 seconds`.
+   * Default: `60 seconds`.
    */
   timeoutInSeconds?: number;
-  /**
-   * @property {number} [maxRetries] Number of times the operation needs to be retried in case
-   * of error. Default: 3.
-   */
-  maxRetries?: number;
-  /**
-   * @property {number} [delayInSeconds] Amount of time to wait in seconds before making the
-   * next attempt. Default: 15.
-   */
-  delayInSeconds?: number;
   /**
    * @property {string} [requestName] Name of the request being performed.
    */
@@ -86,9 +74,7 @@ export class RequestResponseLink implements ReqResLink {
 
   /**
    * Sends the given request message and returns the received response. If the operation is not
-   * completed in the provided timeout in seconds `default: 10`, then the request will be retried
-   * linearly for the provided number of times `default: 3` with the provided delay in seconds
-   * `default: 15` between each attempt.
+   * completed in the provided timeout in seconds `default: 60`, then `OperationTimeoutError` is thrown.
    *
    * @param {Message} request The AMQP (request) message.
    * @param {SendRequestOptions} [options] Options that can be provided while sending a request.
@@ -98,168 +84,145 @@ export class RequestResponseLink implements ReqResLink {
     if (!options) options = {};
 
     if (!options.timeoutInSeconds) {
-      options.timeoutInSeconds = 10;
+      options.timeoutInSeconds = Constants.defaultOperationTimeoutInSeconds;
     }
 
-    let count: number = 0;
     const aborter: AbortSignalLike | undefined = options && options.abortSignal;
 
-    const sendRequestPromise = () =>
-      new Promise<AmqpMessage>((resolve: any, reject: any) => {
-        let waitTimer: any;
-        let timeOver: boolean = false;
-        type NormalizedInfo = {
-          statusCode: number;
-          statusDescription: string;
-          errorCondition: string;
-        };
-
-        count++;
-        if (count !== 1) {
-          // Generate a new message_id every time after the first attempt
-          request.message_id = generate_uuid();
-        } else if (!request.message_id) {
-          // Set the message_id in the first attempt only if it is not set
-          request.message_id = generate_uuid();
-        }
+    return new Promise<AmqpMessage>((resolve: any, reject: any) => {
+      let waitTimer: any;
+      let timeOver: boolean = false;
+      type NormalizedInfo = {
+        statusCode: number;
+        statusDescription: string;
+        errorCondition: string;
+      };
 
-        const rejectOnAbort = () => {
-          const address = this.receiver.address || "address";
-          const requestName = options!.requestName;
-          const desc: string =
-            `[${this.connection.id}] The request "${requestName}" ` +
-            `to "${address}" has been cancelled by the user.`;
-          log.error(desc);
-          const error = new AbortError(
-            `The ${requestName ? requestName + " " : ""}operation has been cancelled by the user.`
-          );
+      const rejectOnAbort = () => {
+        const address = this.receiver.address || "address";
+        const requestName = options!.requestName;
+        const desc: string =
+          `[${this.connection.id}] The request "${requestName}" ` +
+          `to "${address}" has been cancelled by the user.`;
+        log.error(desc);
+        const error = new AbortError(
+          `The ${requestName ? requestName + " " : ""}operation has been cancelled by the user.`
+        );
 
-          reject(error);
-        };
+        reject(error);
+      };
 
-        const onAbort = () => {
-          // remove the event listener as this will be registered next time someone makes a request.
-          this.receiver.removeListener(ReceiverEvents.message, messageCallback);
-          // safe to clear the timeout if it hasn't already occurred.
-          if (!timeOver) {
-            clearTimeout(waitTimer);
-          }
-          aborter!.removeEventListener("abort", onAbort);
+      const onAbort = () => {
+        // remove the event listener as this will be registered next time someone makes a request.
+        this.receiver.removeListener(ReceiverEvents.message, messageCallback);
+        // safe to clear the timeout if it hasn't already occurred.
+        if (!timeOver) {
+          clearTimeout(waitTimer);
+        }
+        aborter!.removeEventListener("abort", onAbort);
 
-          rejectOnAbort();
-        };
+        rejectOnAbort();
+      };
 
-        if (aborter) {
-          // the aborter may have been triggered between request attempts
-          // so check if it was triggered and reject if needed.
-          if (aborter.aborted) {
-            return rejectOnAbort();
-          }
-          aborter.addEventListener("abort", onAbort);
+      if (aborter) {
+        // the aborter may have been triggered between request attempts
+        // so check if it was triggered and reject if needed.
+        if (aborter.aborted) {
+          return rejectOnAbort();
         }
+        aborter.addEventListener("abort", onAbort);
+      }
 
-        // Handle different variations of property names in responses emitted by EventHubs and ServiceBus.
-        const getCodeDescriptionAndError = (props: any): NormalizedInfo => {
-          if (!props) props = {};
-          return {
-            statusCode: (props[Constants.statusCode] || props.statusCode) as number,
-            statusDescription: (props[Constants.statusDescription] ||
-              props.statusDescription) as string,
-            errorCondition: (props[Constants.errorCondition] || props.errorCondition) as string
-          };
+      // Handle different variations of property names in responses emitted by EventHubs and ServiceBus.
+      const getCodeDescriptionAndError = (props: any): NormalizedInfo => {
+        if (!props) props = {};
+        return {
+          statusCode: (props[Constants.statusCode] || props.statusCode) as number,
+          statusDescription: (props[Constants.statusDescription] ||
+            props.statusDescription) as string,
+          errorCondition: (props[Constants.errorCondition] || props.errorCondition) as string
         };
+      };
 
-        const messageCallback = (context: EventContext) => {
-          // remove the event listeners as they will be registered next time when someone makes a request.
-          this.receiver.removeListener(ReceiverEvents.message, messageCallback);
-          if (aborter) {
-            aborter.removeEventListener("abort", onAbort);
-          }
-          const info = getCodeDescriptionAndError(context.message!.application_properties);
-          const responseCorrelationId = context.message!.correlation_id;
-          log.reqres(
-            "[%s] %s response: ",
-            this.connection.id,
-            request.to || "$management",
-            context.message
-          );
-          if (info.statusCode > 199 && info.statusCode < 300) {
-            if (
-              request.message_id === responseCorrelationId ||
-              request.correlation_id === responseCorrelationId
-            ) {
-              if (!timeOver) {
-                clearTimeout(waitTimer);
-              }
-              log.reqres(
-                "[%s] request-messageId | '%s' == '%s' | response-correlationId.",
-                this.connection.id,
-                request.message_id,
-                responseCorrelationId
-              );
-              return resolve(context.message);
-            } else {
-              log.error(
-                "[%s] request-messageId | '%s' != '%s' | response-correlationId. " +
-                  "Hence dropping this response and waiting for the next one.",
-                this.connection.id,
-                request.message_id,
-                responseCorrelationId
-              );
+      const messageCallback = (context: EventContext) => {
+        // remove the event listeners as they will be registered next time when someone makes a request.
+        this.receiver.removeListener(ReceiverEvents.message, messageCallback);
+        if (aborter) {
+          aborter.removeEventListener("abort", onAbort);
+        }
+        const info = getCodeDescriptionAndError(context.message!.application_properties);
+        const responseCorrelationId = context.message!.correlation_id;
+        log.reqres(
+          "[%s] %s response: ",
+          this.connection.id,
+          request.to || "$management",
+          context.message
+        );
+        if (info.statusCode > 199 && info.statusCode < 300) {
+          if (
+            request.message_id === responseCorrelationId ||
+            request.correlation_id === responseCorrelationId
+          ) {
+            if (!timeOver) {
+              clearTimeout(waitTimer);
             }
+            log.reqres(
+              "[%s] request-messageId | '%s' == '%s' | response-correlationId.",
+              this.connection.id,
+              request.message_id,
+              responseCorrelationId
+            );
+            return resolve(context.message);
           } else {
-            const condition =
-              info.errorCondition ||
-              ConditionStatusMapper[info.statusCode] ||
-              "amqp:internal-error";
-            const e: AmqpError = {
-              condition: condition,
-              description: info.statusDescription
-            };
-            const error = translate(e);
-            log.error(error);
-            return reject(error);
-          }
-        };
-
-        const actionAfterTimeout = () => {
-          timeOver = true;
-          this.receiver.removeListener(ReceiverEvents.message, messageCallback);
-          if (aborter) {
-            aborter.removeEventListener("abort", onAbort);
+            log.error(
+              "[%s] request-messageId | '%s' != '%s' | response-correlationId. " +
+                "Hence dropping this response and waiting for the next one.",
+              this.connection.id,
+              request.message_id,
+              responseCorrelationId
+            );
           }
-          const address = this.receiver.address || "address";
-          const desc: string =
-            `The request with message_id "${request.message_id}" to "${address}" ` +
-            `endpoint timed out. Please try again later.`;
+        } else {
+          const condition =
+            info.errorCondition || ConditionStatusMapper[info.statusCode] || "amqp:internal-error";
           const e: AmqpError = {
-            condition: ConditionStatusMapper[408],
-            description: desc
+            condition: condition,
+            description: info.statusDescription
           };
-          return reject(translate(e));
+          const error = translate(e);
+          log.error(error);
+          return reject(error);
+        }
+      };
+
+      const actionAfterTimeout = () => {
+        timeOver = true;
+        this.receiver.removeListener(ReceiverEvents.message, messageCallback);
+        if (aborter) {
+          aborter.removeEventListener("abort", onAbort);
+        }
+        const address = this.receiver.address || "address";
+        const desc: string =
+          `The request with message_id "${request.message_id}" to "${address}" ` +
+          `endpoint timed out. Please try again later.`;
+        const e: Error = {
+          name: "OperationTimeoutError",
+          message: desc
         };
+        return reject(translate(e));
+      };
 
-        this.receiver.on(ReceiverEvents.message, messageCallback);
-        waitTimer = setTimeout(actionAfterTimeout, options!.timeoutInSeconds! * 1000);
-        log.reqres(
-          "[%s] %s request sent: %O",
-          this.connection.id,
-          request.to || "$managment",
-          request
-        );
-        this.sender.send(request);
-      });
-    const config: RetryConfig<AmqpMessage> = {
-      operation: sendRequestPromise,
-      connectionId: this.connection.id,
-      operationType:
-        request.to && request.to === Constants.cbsEndpoint
-          ? RetryOperationType.cbsAuth
-          : RetryOperationType.management,
-      delayInSeconds: options.delayInSeconds,
-      maxRetries: options.maxRetries
-    };
-    return retry<AmqpMessage>(config);
+      waitTimer = setTimeout(actionAfterTimeout, options!.timeoutInSeconds! * 1000);
+      this.receiver.on(ReceiverEvents.message, messageCallback);
+
+      log.reqres(
+        "[%s] %s request sent: %O",
+        this.connection.id,
+        request.to || "$managment",
+        request
+      );
+      this.sender.send(request);
+    });
   }
 
   /**
diff --git a/sdk/core/core-amqp/test/requestResponse.spec.ts b/sdk/core/core-amqp/test/requestResponse.spec.ts
index 5dc5a54a8e1e..fa231dbb5015 100644
--- a/sdk/core/core-amqp/test/requestResponse.spec.ts
+++ b/sdk/core/core-amqp/test/requestResponse.spec.ts
@@ -2,11 +2,18 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import * as assert from "assert";
-import { RequestResponseLink, AmqpMessage, ErrorNameConditionMapper } from "../src";
-import { Connection } from "rhea-promise";
+import {
+  RequestResponseLink,
+  AmqpMessage,
+  ErrorNameConditionMapper,
+  RetryConfig,
+  RetryOperationType,
+  retry
+} from "../src";
+import { Connection, Message } from "rhea-promise";
 import { stub } from "sinon";
 import EventEmitter from "events";
-import { AbortController } from "@azure/abort-controller";
+import { AbortController, AbortSignalLike } from "@azure/abort-controller";
 
 describe("RequestResponseLink", function() {
   it("should send a request and receive a response correctly", async function() {
@@ -53,11 +60,11 @@ describe("RequestResponseLink", function() {
     assert.equal(response.correlation_id, req.message_id);
   });
 
-  it("should send a request and receive a response correctly", async function() {
+  it("should surface error up through retry", async function() {
     const connectionStub = stub(new Connection());
     const rcvr = new EventEmitter();
     let messageId: string = "";
-    let counter = 0;
+    let count = 0;
     connectionStub.createSession.resolves({
       connection: {
         id: "connection-1"
@@ -65,12 +72,7 @@ describe("RequestResponseLink", function() {
       createSender: () => {
         return Promise.resolve({
           send: (request: any) => {
-            counter++;
-            if (counter != 1) {
-              assert.notEqual(messageId, undefined);
-              assert.notEqual(request.message_id, undefined);
-              assert.notEqual(messageId, request.message_id);
-            }
+            count++;
             messageId = request.message_id;
           }
         });
@@ -98,7 +100,7 @@ describe("RequestResponseLink", function() {
           }
         }
       });
-    }, 2000);
+    }, 500);
     setTimeout(() => {
       rcvr.emit("message", {
         message: {
@@ -112,12 +114,26 @@ describe("RequestResponseLink", function() {
           body: "Hello World!!"
         }
       });
-    }, 4000);
-    const response = await link.sendRequest(request, {
-      delayInSeconds: 1,
-      timeoutInSeconds: 5
-    });
-    assert.equal(response.correlation_id, messageId);
+    }, 1000);
+
+    const sendRequestPromise = async (): Promise<Message> => {
+      return await link.sendRequest(request, {
+        timeoutInSeconds: 5
+      });
+    };
+
+    const config: RetryConfig<Message> = {
+      operation: sendRequestPromise,
+      connectionId: "connection-1",
+      operationType: RetryOperationType.management,
+      maxRetries: 3,
+      delayInSeconds: 1
+    };
+
+    const message = await retry<Message>(config);
+    assert.equal(count, 2, "It should retry twice");
+    assert.equal(message == undefined, false, "It should return a valid message");
+    assert.equal(message.body, "Hello World!!", `Message '${message.body}' is not as expected`);
   });
 
   it("should abort a request and response correctly", async function() {
@@ -171,15 +187,19 @@ describe("RequestResponseLink", function() {
         /The foo operation has been cancelled by the user.$/,
         "gi"
       );
-      assert.equal(expectedErrorRegex.test(err.message), true);
+      assert.equal(err.name, "AbortError", `Error name ${err.name} is not as expected`);
+      assert.equal(
+        expectedErrorRegex.test(err.message),
+        true,
+        `Incorrect error received "${err.message}"`
+      );
     }
   });
 
-  it("should abort a request and response correctly when retried", async function() {
+  it("should abort a request and response correctly when abort signal is already fired", async function() {
     const connectionStub = stub(new Connection());
     const rcvr = new EventEmitter();
-    let messageId: string = "";
-    let counter = 0;
+    let req: any = {};
     connectionStub.createSession.resolves({
       connection: {
         id: "connection-1"
@@ -187,13 +207,7 @@ describe("RequestResponseLink", function() {
       createSender: () => {
         return Promise.resolve({
           send: (request: any) => {
-            counter++;
-            if (counter != 1) {
-              assert.notEqual(messageId, undefined);
-              assert.notEqual(request.message_id, undefined);
-              assert.notEqual(messageId, request.message_id);
-            }
-            messageId = request.message_id;
+            req = request;
           }
         });
       },
@@ -211,20 +225,7 @@ describe("RequestResponseLink", function() {
     setTimeout(() => {
       rcvr.emit("message", {
         message: {
-          correlation_id: messageId,
-          application_properties: {
-            statusCode: 500,
-            errorCondition: ErrorNameConditionMapper.InternalServerError,
-            statusDescription: "Please retry later.",
-            "com.microsoft:tracking-id": "1"
-          }
-        }
-      });
-    }, 2000);
-    setTimeout(() => {
-      rcvr.emit("message", {
-        message: {
-          correlation_id: messageId,
+          correlation_id: req.message_id,
           application_properties: {
             statusCode: 200,
             errorCondition: null,
@@ -234,19 +235,19 @@ describe("RequestResponseLink", function() {
           body: "Hello World!!"
         }
       });
-    }, 4000);
+    }, 2000);
     try {
       const controller = new AbortController();
-      const signal = controller.signal;
-      setTimeout(controller.abort.bind(controller), 100);
-      await link.sendRequest(request, {
-        delayInSeconds: 1,
-        timeoutInSeconds: 5,
-        abortSignal: signal // cancel between request attempts
-      });
+      const signal: AbortSignalLike = controller.signal;
+      controller.abort();
+      await link.sendRequest(request, { abortSignal: signal, requestName: "foo" });
       throw new Error(`Test failure`);
     } catch (err) {
-      const expectedErrorRegex = new RegExp(/The operation has been cancelled by the user.$/, "gi");
+      const expectedErrorRegex = new RegExp(
+        /The foo operation has been cancelled by the user.$/,
+        "gi"
+      );
+      assert.equal(err.name, "AbortError", `Error name ${err.name} is not as expected`);
       assert.equal(
         expectedErrorRegex.test(err.message),
         true,
diff --git a/sdk/eventhub/event-hubs/src/managementClient.ts b/sdk/eventhub/event-hubs/src/managementClient.ts
index 26e615be262b..8b85ab83bfc0 100644
--- a/sdk/eventhub/event-hubs/src/managementClient.ts
+++ b/sdk/eventhub/event-hubs/src/managementClient.ts
@@ -7,7 +7,10 @@ import {
   defaultLock,
   translate,
   Constants,
-  SendRequestOptions
+  SendRequestOptions,
+  retry,
+  RetryConfig,
+  RetryOperationType
 } from "@azure/core-amqp";
 import {
   Message,
@@ -15,13 +18,14 @@ import {
   SenderEvents,
   ReceiverEvents,
   SenderOptions,
-  ReceiverOptions
+  ReceiverOptions,
+  generate_uuid
 } from "rhea-promise";
 import { ConnectionContext } from "./connectionContext";
 import { LinkEntity } from "./linkEntity";
 import * as log from "./log";
 import { RetryOptions, getRetryAttemptTimeoutInMs } from "./eventHubClient";
-import { AbortSignalLike } from "@azure/abort-controller";
+import { AbortSignalLike, AbortError } from "@azure/abort-controller";
 /**
  * Describes the runtime information of an Event Hub.
  * @interface HubRuntimeInformation
@@ -303,34 +307,128 @@ export class ManagementClient extends LinkEntity {
    */
   private async _makeManagementRequest(
     request: Message,
-    options?: { retryOptions?: RetryOptions; abortSignal?: AbortSignalLike; requestName?: string }
+    options: {
+      retryOptions?: RetryOptions;
+      abortSignal?: AbortSignalLike;
+      requestName?: string;
+    } = {}
   ): Promise<any> {
     try {
-      log.mgmt(
-        "[%s] Acquiring lock to get the management req res link.",
-        this._context.connectionId
-      );
-      await defaultLock.acquire(this.managementLock, () => {
-        return this._init();
-      });
+      const aborter: AbortSignalLike | undefined = options && options.abortSignal;
 
-      if (!options) {
-        options = {};
-      }
+      const sendOperationPromise = () =>
+        new Promise<Message>(async (resolve, reject) => {
+          try {
+            let count = 0;
+
+            const retryTimeoutInMs = getRetryAttemptTimeoutInMs(options.retryOptions);
+            let timeTakenByInit = 0;
+
+            const rejectOnAbort = () => {
+              const requestName = options.requestName;
+              const desc: string =
+                `[${this._context.connectionId}] The request "${requestName}" ` +
+                `to has been cancelled by the user.`;
+              log.error(desc);
+              const error = new AbortError(
+                `The ${
+                  requestName ? requestName + " " : ""
+                }operation has been cancelled by the user.`
+              );
+
+              reject(error);
+            };
+
+            if (aborter) {
+              if (aborter.aborted) {
+                return rejectOnAbort();
+              }
+            }
+
+            if (!this._isMgmtRequestResponseLinkOpen()) {
+              log.mgmt(
+                "[%s] Acquiring lock to get the management req res link.",
+                this._context.connectionId
+              );
+
+              const initOperationStartTime = Date.now();
+
+              const actionAfterTimeout = () => {
+                const desc: string = `The request with message_id "${request.message_id}" timed out. Please try again later.`;
+                const e: Error = {
+                  name: "OperationTimeoutError",
+                  message: desc
+                };
+
+                return reject(translate(e));
+              };
+
+              const waitTimer = setTimeout(actionAfterTimeout, retryTimeoutInMs);
+
+              try {
+                await defaultLock.acquire(this.managementLock, () => {
+                  return this._init();
+                });
+              } catch (err) {
+                return reject(translate(err));
+              } finally {
+                clearTimeout(waitTimer);
+              }
+              timeTakenByInit = Date.now() - initOperationStartTime;
+            }
+
+            const remainingOperationTimeoutInMs = retryTimeoutInMs - timeTakenByInit;
+
+            const sendRequestOptions: SendRequestOptions = {
+              abortSignal: options.abortSignal,
+              requestName: options.requestName,
+              timeoutInSeconds: remainingOperationTimeoutInMs / 1000
+            };
+
+            count++;
+            if (count !== 1) {
+              // Generate a new message_id every time after the first attempt
+              request.message_id = generate_uuid();
+            } else if (!request.message_id) {
+              // Set the message_id in the first attempt only if it is not set
+              request.message_id = generate_uuid();
+            }
+
+            const result = await this._mgmtReqResLink!.sendRequest(request, sendRequestOptions);
+
+            resolve(result);
+          } catch (err) {
+            err = translate(err);
+            const address =
+              this._mgmtReqResLink || this._mgmtReqResLink!.sender.address
+                ? "address"
+                : this._mgmtReqResLink!.sender.address;
+            log.error(
+              "[%s] An error occurred during send on management request-response link with address " +
+                "'%s': %O",
+              this._context.connectionId,
+              address,
+              err
+            );
+            reject(err);
+          }
+        });
 
-      const sendRequestOptions: SendRequestOptions = {
-        maxRetries: options.retryOptions && options.retryOptions.maxRetries,
-        abortSignal: options.abortSignal,
-        requestName: options.requestName,
-        timeoutInSeconds: getRetryAttemptTimeoutInMs(options.retryOptions) / 1000,
-        delayInSeconds:
-          options.retryOptions &&
-          options.retryOptions.retryInterval &&
-          options.retryOptions.retryInterval >= 0
-            ? options.retryOptions.retryInterval / 1000
-            : undefined
+      const maxRetries = options.retryOptions && options.retryOptions.maxRetries;
+      const delayInSeconds =
+        options.retryOptions &&
+        options.retryOptions.retryInterval &&
+        options.retryOptions.retryInterval >= 0
+          ? options.retryOptions.retryInterval / 1000
+          : Constants.defaultDelayBetweenOperationRetriesInSeconds;
+      const config: RetryConfig<Message> = {
+        operation: sendOperationPromise,
+        connectionId: this._context.connectionId,
+        operationType: RetryOperationType.management,
+        maxRetries: maxRetries,
+        delayInSeconds: delayInSeconds
       };
-      return (await this._mgmtReqResLink!.sendRequest(request, sendRequestOptions)).body;
+      return (await retry<Message>(config)).body;
     } catch (err) {
       err = translate(err);
       log.error("An error occurred while making the request to $management endpoint: %O", err);

From afa6d95087f0b37438615828beb1f28e2f9c7107 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 29 Jul 2019 16:54:44 -0700
Subject: [PATCH 06/24] Update dev dependency fs-extra to latest (#4510)

- Dependency was accidentally added with a `~` instead of `^`
---
 common/config/rush/pnpm-lock.yaml          | 47 +++++++++++-----------
 sdk/keyvault/keyvault-keys/package.json    |  4 +-
 sdk/keyvault/keyvault-secrets/package.json |  6 +--
 sdk/storage/storage-blob/package.json      |  4 +-
 sdk/storage/storage-file/package.json      |  4 +-
 sdk/storage/storage-queue/package.json     |  4 +-
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 602c19c3062a..f60c5e5b7dd7 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -37,7 +37,7 @@ dependencies:
   '@types/debug': 0.0.31
   '@types/dotenv': 6.1.1
   '@types/express': 4.17.0
-  '@types/fs-extra': 7.0.0
+  '@types/fs-extra': 8.0.0
   '@types/glob': 7.1.1
   '@types/is-buffer': 2.0.0
   '@types/jssha': 2.0.0
@@ -93,7 +93,7 @@ dependencies:
   execa: 1.0.0
   express: 4.17.1
   form-data: 2.5.0
-  fs-extra: 8.0.1
+  fs-extra: 8.1.0
   glob: 7.1.4
   gulp: 4.0.2
   gulp-zip: 4.2.0
@@ -551,12 +551,12 @@ packages:
     dev: false
     resolution:
       integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==
-  /@types/fs-extra/7.0.0:
+  /@types/fs-extra/8.0.0:
     dependencies:
       '@types/node': 8.10.51
     dev: false
     resolution:
-      integrity: sha512-ndoMMbGyuToTy4qB6Lex/inR98nPiNHacsgMPvy+zqMLgSxbt8VtWpDArpGp69h1fEDQHn1KB+9DWD++wgbwYA==
+      integrity: sha512-bCtL5v9zdbQW86yexOlXWTEGvLNqWxMFyi7gQA7Gcthbezr2cPSOb8SkESVKA937QD5cIwOFLDFt0MQoXOEr9Q==
   /@types/glob/7.1.1:
     dependencies:
       '@types/events': 3.0.0
@@ -4086,7 +4086,7 @@ packages:
       node: '>=6 <7 || >=8'
     resolution:
       integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  /fs-extra/8.0.1:
+  /fs-extra/8.1.0:
     dependencies:
       graceful-fs: 4.2.0
       jsonfile: 4.0.0
@@ -4095,7 +4095,7 @@ packages:
     engines:
       node: '>=6 <7 || >=8'
     resolution:
-      integrity: sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==
+      integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   /fs-mkdirp-stream/1.0.0:
     dependencies:
       graceful-fs: 4.2.0
@@ -10264,7 +10264,7 @@ packages:
       '@microsoft/api-extractor': 7.3.4
       '@types/chai': 4.1.7
       '@types/dotenv': 6.1.1
-      '@types/fs-extra': 7.0.0
+      '@types/fs-extra': 8.0.0
       '@types/mocha': 5.2.7
       '@types/nise': 1.4.0
       '@types/nock': 10.0.3
@@ -10282,7 +10282,7 @@ packages:
       eslint-plugin-no-null: 1.0.2_eslint@5.16.0
       eslint-plugin-no-only-tests: 2.3.1
       eslint-plugin-promise: 4.2.1
-      fs-extra: 8.0.1
+      fs-extra: 8.1.0
       karma: 4.2.0
       karma-chrome-launcher: 2.2.0
       karma-coverage: 1.1.2
@@ -10323,7 +10323,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-keys'
     resolution:
-      integrity: sha512-kv1LOiu2pl432/WjarVRLropOwyQrGkOU4tdlA6MiTR9aeysnBosJzkOlScA6HdnBA1rUaoZoILYXQg7x6eS+g==
+      integrity: sha512-0KyjwRyl+yA7zJyAI0xHYbnZNgew8UYJ1pq2wH+r/BUgep5rG7j7imxQ2W3etCT+VtW7E61CAb+pzXZvNEtIRA==
       tarball: 'file:projects/keyvault-keys.tgz'
     version: 0.0.0
   'file:projects/keyvault-secrets.tgz':
@@ -10333,7 +10333,7 @@ packages:
       '@microsoft/api-extractor': 7.3.4
       '@types/chai': 4.1.7
       '@types/dotenv': 6.1.1
-      '@types/fs-extra': 7.0.0
+      '@types/fs-extra': 8.0.0
       '@types/mocha': 5.2.7
       '@types/nise': 1.4.0
       '@types/nock': 10.0.3
@@ -10351,7 +10351,7 @@ packages:
       eslint-plugin-no-null: 1.0.2_eslint@5.16.0
       eslint-plugin-no-only-tests: 2.3.1
       eslint-plugin-promise: 4.2.1
-      fs-extra: 8.0.1
+      fs-extra: 8.1.0
       karma: 4.2.0
       karma-chrome-launcher: 2.2.0
       karma-coverage: 1.1.2
@@ -10392,7 +10392,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-secrets'
     resolution:
-      integrity: sha512-x5m+5BJfn2ssYVl2jzY4YVgvVpgOHP8IQdoFzVG5NlUhYld2DHz4KsEzgYUGdQx5SNud9KLLimjIb4f9FPzSjQ==
+      integrity: sha512-SQ1nP42JIzdivbtGoR7elcmoIams06g57Xu2OScuAPihA8wNqkvdgSUTxJj2boIEnaQDGR1D15WhNJWNqPPS4A==
       tarball: 'file:projects/keyvault-secrets.tgz'
     version: 0.0.0
   'file:projects/service-bus.tgz':
@@ -10478,7 +10478,7 @@ packages:
       '@azure/ms-rest-js': 2.0.3
       '@microsoft/api-extractor': 7.3.4
       '@types/dotenv': 6.1.1
-      '@types/fs-extra': 7.0.0
+      '@types/fs-extra': 8.0.0
       '@types/mocha': 5.2.7
       '@types/nise': 1.4.0
       '@types/nock': 10.0.3
@@ -10497,7 +10497,7 @@ packages:
       eslint-plugin-no-only-tests: 2.3.1
       eslint-plugin-promise: 4.2.1
       events: 3.0.0
-      fs-extra: 8.0.1
+      fs-extra: 8.1.0
       gulp: 4.0.2
       gulp-zip: 4.2.0
       inherits: 2.0.4
@@ -10541,7 +10541,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-blob'
     resolution:
-      integrity: sha512-tGWJWCTrj3/4my2Pij9nPgBj0I9PQSm9p0eCnZ2VRn+LapRqILrmNu5wr51bFfBHeUH9zuqHr1pCP2vunHgf3Q==
+      integrity: sha512-7gm0+9x+ftqH1gOfX9bVQqG3xSp8YOhy55adAv073zQOtCH8TH0LOVqH5+o4b6Jntsjy1CSaPdbmP/xCK24FXQ==
       tarball: 'file:projects/storage-blob.tgz'
     version: 0.0.0
   'file:projects/storage-file.tgz':
@@ -10549,7 +10549,7 @@ packages:
       '@azure/ms-rest-js': 2.0.3
       '@microsoft/api-extractor': 7.3.4
       '@types/dotenv': 6.1.1
-      '@types/fs-extra': 7.0.0
+      '@types/fs-extra': 8.0.0
       '@types/mocha': 5.2.7
       '@types/nise': 1.4.0
       '@types/nock': 10.0.3
@@ -10568,7 +10568,7 @@ packages:
       eslint-plugin-no-only-tests: 2.3.1
       eslint-plugin-promise: 4.2.1
       events: 3.0.0
-      fs-extra: 8.0.1
+      fs-extra: 8.1.0
       gulp: 4.0.2
       gulp-zip: 4.2.0
       inherits: 2.0.4
@@ -10612,7 +10612,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-file'
     resolution:
-      integrity: sha512-GjGI/eUKKhovQodQwcjXxpNHSD7J1FK9ewbS0RR5qPFbtlgCxNZuzZqc35tL90gFYb8O+nOc+kS90L6XZ+7mQw==
+      integrity: sha512-p6FXuKOLY9zqWg4mqGXgoEZcOzfA4uQ8RWKB5b6HyBCvSDtmviKYgOqwjGd3fZyGT5QoaY9g0x0ztCP7XWNcOw==
       tarball: 'file:projects/storage-file.tgz'
     version: 0.0.0
   'file:projects/storage-queue.tgz':
@@ -10620,7 +10620,7 @@ packages:
       '@azure/ms-rest-js': 2.0.3
       '@microsoft/api-extractor': 7.3.4
       '@types/dotenv': 6.1.1
-      '@types/fs-extra': 7.0.0
+      '@types/fs-extra': 8.0.0
       '@types/mocha': 5.2.7
       '@types/nise': 1.4.0
       '@types/nock': 10.0.3
@@ -10638,7 +10638,7 @@ packages:
       eslint-plugin-no-null: 1.0.2_eslint@5.16.0
       eslint-plugin-no-only-tests: 2.3.1
       eslint-plugin-promise: 4.2.1
-      fs-extra: 8.0.1
+      fs-extra: 8.1.0
       gulp: 4.0.2
       gulp-zip: 4.2.0
       inherits: 2.0.4
@@ -10682,7 +10682,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-queue'
     resolution:
-      integrity: sha512-iZiHy2U1uaFwWgPnYPzB68BWV7cFjb3N0jrnWKG39/QVu3JMdlLQzwZ6iyJwBNq3+3qzi+eKQu0TUK0vv+GdUQ==
+      integrity: sha512-JLrNUMeV03OgrviE774rsZlMot0F2jN3wtDrr5plPqR0i/FgMSciMfJRUmOiG3teTZo+u8fEgf2feBv+M0wSGA==
       tarball: 'file:projects/storage-queue.tgz'
     version: 0.0.0
   'file:projects/template.tgz':
@@ -10761,6 +10761,7 @@ packages:
       integrity: sha512-rdhMvXi7mvg+wP0vVdqhouZr17v9a3n4KDMSyuUPU9qhOvY6bMfqoeIXrzgWkCXtR9yjL15gwJHKWsBlByGE4A==
       tarball: 'file:projects/testhub.tgz'
     version: 0.0.0
+registry: ''
 specifiers:
   '@azure/abort-controller': 1.0.0-preview.1
   '@azure/amqp-common': 1.0.0-preview.6
@@ -10800,7 +10801,7 @@ specifiers:
   '@types/debug': ^0.0.31
   '@types/dotenv': ^6.1.0
   '@types/express': ^4.16.0
-  '@types/fs-extra': ~7.0.0
+  '@types/fs-extra': ^8.0.0
   '@types/glob': ^7.1.1
   '@types/is-buffer': ^2.0.0
   '@types/jssha': ^2.0.0
@@ -10856,7 +10857,7 @@ specifiers:
   execa: 1.0.0
   express: ^4.16.3
   form-data: ^2.5.0
-  fs-extra: ~8.0.1
+  fs-extra: ^8.1.0
   glob: ^7.1.2
   gulp: ^4.0.0
   gulp-zip: ^4.2.0
diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json
index c3dacb301ed9..4eb3762788b0 100644
--- a/sdk/keyvault/keyvault-keys/package.json
+++ b/sdk/keyvault/keyvault-keys/package.json
@@ -79,7 +79,7 @@
     "@microsoft/api-extractor": "^7.1.5",
     "@types/chai": "^4.1.6",
     "@types/dotenv": "^6.1.0",
-    "@types/fs-extra": "~7.0.0",
+    "@types/fs-extra": "^8.0.0",
     "@types/mocha": "^5.2.5",
     "@types/nise": "^1.4.0",
     "@types/nock": "^10.0.1",
@@ -97,7 +97,7 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-no-only-tests": "^2.3.0",
     "eslint-plugin-promise": "^4.1.1",
-    "fs-extra": "~8.0.1",
+    "fs-extra": "^8.1.0",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.2",
diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json
index 0fb4b03d1d5c..b366c48f4fe7 100644
--- a/sdk/keyvault/keyvault-secrets/package.json
+++ b/sdk/keyvault/keyvault-secrets/package.json
@@ -68,8 +68,8 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@azure/core-arm": "1.0.0-preview.2",
     "@azure/abort-controller": "1.0.0-preview.1",
+    "@azure/core-arm": "1.0.0-preview.2",
     "@azure/core-http": "1.0.0-preview.2",
     "@azure/core-paging": "1.0.0-preview.1",
     "@azure/identity": "1.0.0-preview.2",
@@ -79,7 +79,7 @@
     "@microsoft/api-extractor": "^7.1.5",
     "@types/chai": "^4.1.6",
     "@types/dotenv": "^6.1.0",
-    "@types/fs-extra": "~7.0.0",
+    "@types/fs-extra": "^8.0.0",
     "@types/mocha": "^5.2.5",
     "@types/nise": "^1.4.0",
     "@types/nock": "^10.0.1",
@@ -97,7 +97,7 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-no-only-tests": "^2.3.0",
     "eslint-plugin-promise": "^4.1.1",
-    "fs-extra": "~8.0.1",
+    "fs-extra": "^8.1.0",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.2",
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index 17018f595069..62d44163b789 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -81,7 +81,7 @@
   "devDependencies": {
     "@microsoft/api-extractor": "^7.1.5",
     "@types/dotenv": "^6.1.0",
-    "@types/fs-extra": "~7.0.0",
+    "@types/fs-extra": "^8.0.0",
     "@types/mocha": "^5.2.5",
     "@types/nise": "^1.4.0",
     "@types/nock": "^10.0.1",
@@ -99,7 +99,7 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-no-only-tests": "^2.3.0",
     "eslint-plugin-promise": "^4.1.1",
-    "fs-extra": "~8.0.1",
+    "fs-extra": "^8.1.0",
     "gulp": "^4.0.0",
     "gulp-zip": "^4.2.0",
     "inherits": "^2.0.3",
diff --git a/sdk/storage/storage-file/package.json b/sdk/storage/storage-file/package.json
index e8e11a0afe6a..3305b3022278 100644
--- a/sdk/storage/storage-file/package.json
+++ b/sdk/storage/storage-file/package.json
@@ -81,7 +81,7 @@
   "devDependencies": {
     "@microsoft/api-extractor": "^7.1.5",
     "@types/dotenv": "^6.1.0",
-    "@types/fs-extra": "~7.0.0",
+    "@types/fs-extra": "^8.0.0",
     "@types/mocha": "^5.2.5",
     "@types/nise": "^1.4.0",
     "@types/nock": "^10.0.1",
@@ -99,7 +99,7 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-no-only-tests": "^2.3.0",
     "eslint-plugin-promise": "^4.1.1",
-    "fs-extra": "~8.0.1",
+    "fs-extra": "^8.1.0",
     "gulp": "^4.0.0",
     "gulp-zip": "^4.2.0",
     "inherits": "^2.0.3",
diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
index eddf189cd53b..eea144e36d2a 100644
--- a/sdk/storage/storage-queue/package.json
+++ b/sdk/storage/storage-queue/package.json
@@ -79,7 +79,7 @@
   "devDependencies": {
     "@microsoft/api-extractor": "^7.1.5",
     "@types/dotenv": "^6.1.0",
-    "@types/fs-extra": "~7.0.0",
+    "@types/fs-extra": "^8.0.0",
     "@types/mocha": "^5.2.5",
     "@types/nise": "^1.4.0",
     "@types/nock": "^10.0.1",
@@ -97,7 +97,7 @@
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-no-only-tests": "^2.3.0",
     "eslint-plugin-promise": "^4.1.1",
-    "fs-extra": "~8.0.1",
+    "fs-extra": "^8.1.0",
     "gulp": "^4.0.0",
     "gulp-zip": "^4.2.0",
     "inherits": "^2.0.3",

From ec36dd8c3f5960103adb2ff64715f0057d76b75f Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 29 Jul 2019 17:02:10 -0700
Subject: [PATCH 07/24] Update dev dependency dotenv to latest (#4507)

---
 common/config/rush/pnpm-lock.yaml             | 46 +++++++++----------
 sdk/core/core-amqp/package.json               |  2 +-
 sdk/eventhub/event-hubs/package.json          |  2 +-
 .../event-processor-host/package.json         |  8 ++--
 sdk/keyvault/keyvault-keys/package.json       |  2 +-
 sdk/keyvault/keyvault-secrets/package.json    |  2 +-
 sdk/servicebus/service-bus/package.json       |  2 +-
 sdk/storage/storage-blob/package.json         |  2 +-
 sdk/storage/storage-file/package.json         |  2 +-
 sdk/storage/storage-queue/package.json        |  2 +-
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index f60c5e5b7dd7..513ce717f4bc 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -81,7 +81,7 @@ dependencies:
   death: 1.1.0
   debug: 3.2.6
   delay: 4.3.0
-  dotenv: 7.0.0
+  dotenv: 8.0.0
   es6-promise: 4.2.8
   eslint: 5.16.0
   eslint-config-prettier: 4.3.0_eslint@5.16.0
@@ -3178,12 +3178,12 @@ packages:
       npm: '>=1.2'
     resolution:
       integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-  /dotenv/7.0.0:
+  /dotenv/8.0.0:
     dev: false
     engines:
-      node: '>=6'
+      node: '>=8'
     resolution:
-      integrity: sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+      integrity: sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
   /duplexer/0.1.1:
     dev: false
     resolution:
@@ -9753,7 +9753,7 @@ packages:
       chai-as-promised: 7.1.1_chai@4.2.0
       cross-env: 5.2.0
       debug: 3.2.6
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
       eslint-detailed-reporter: 0.8.0_eslint@5.16.0
@@ -9798,7 +9798,7 @@ packages:
     dev: false
     name: '@rush-temp/core-amqp'
     resolution:
-      integrity: sha512-3d4t4tY50JEufJCuo2xyd4O/T+QoOJARDeDshU+BtuYOwt7z5BTLEk5Oply8pTspZadGEIs+qqhGE/HkQ2ZFxw==
+      integrity: sha512-JGhBmY1aoKDanjTSlKcTn/GuPQTt6fCJlbVZvrv0X/SwenzgUSu7JZlqyuV7g3szIO/2HofxgCgD+zrYlIT8EA==
       tarball: 'file:projects/core-amqp.tgz'
     version: 0.0.0
   'file:projects/core-arm.tgz':
@@ -10068,7 +10068,7 @@ packages:
       chai-string: 1.5.0_chai@4.2.0
       cross-env: 5.2.0
       debug: 3.2.6
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
       eslint-detailed-reporter: 0.8.0_eslint@5.16.0
@@ -10116,7 +10116,7 @@ packages:
     dev: false
     name: '@rush-temp/event-hubs'
     resolution:
-      integrity: sha512-0mjQEMP/AVz7oC1IAlNLQ33iz4Nr5+qBaXXYl61l8Xk/jIAgIMhQPZBy1vRj9MzG1dW71rmAVVsK2RSIH7k3uA==
+      integrity: sha512-YI3xKLnd3MkrHU3jKg0o9hwRWqxr7Rrie5irJpZIc/WbTOZxugllxYKOo44LmCkLgaw1/dUHm4k5kr8fgXPq8A==
       tarball: 'file:projects/event-hubs.tgz'
     version: 0.0.0
   'file:projects/event-processor-host.tgz':
@@ -10143,7 +10143,7 @@ packages:
       chai-string: 1.5.0_chai@4.2.0
       cross-env: 5.2.0
       debug: 3.2.6
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
       eslint-detailed-reporter: 0.8.0_eslint@5.16.0
@@ -10174,7 +10174,7 @@ packages:
     dev: false
     name: '@rush-temp/event-processor-host'
     resolution:
-      integrity: sha512-ArbUM9DPleTcwpTC+4K/0fPHmaYl4POCPoGdwyFmHWq6Jci/i2QUwzKVsRt/g1x/N2QmpX9b1ptBbQbCFo5w4A==
+      integrity: sha512-pCHa7gfFwSGhUdYTEOTi29ju3u19hchXhPvyKVCuY5PXrYUEd2U6XikvFs5QCdcDNT4417vO3P7fBQdNnppbpw==
       tarball: 'file:projects/event-processor-host.tgz'
     version: 0.0.0
   'file:projects/identity.tgz':
@@ -10275,7 +10275,7 @@ packages:
       assert: 1.5.0
       chai: 4.2.0
       cross-env: 5.2.0
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
       eslint-detailed-reporter: 0.8.0_eslint@5.16.0
@@ -10323,7 +10323,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-keys'
     resolution:
-      integrity: sha512-0KyjwRyl+yA7zJyAI0xHYbnZNgew8UYJ1pq2wH+r/BUgep5rG7j7imxQ2W3etCT+VtW7E61CAb+pzXZvNEtIRA==
+      integrity: sha512-GTQM+glliP/d7vxPSkXYr+h/mCWBAo8KdWEuGHgrnDj8ngOlcJbiORLMpD9aRBan38Jb+rgBSU5j0w8Gwu8oKA==
       tarball: 'file:projects/keyvault-keys.tgz'
     version: 0.0.0
   'file:projects/keyvault-secrets.tgz':
@@ -10344,7 +10344,7 @@ packages:
       assert: 1.5.0
       chai: 4.2.0
       cross-env: 5.2.0
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
       eslint-detailed-reporter: 0.8.0_eslint@5.16.0
@@ -10392,7 +10392,7 @@ packages:
     dev: false
     name: '@rush-temp/keyvault-secrets'
     resolution:
-      integrity: sha512-SQ1nP42JIzdivbtGoR7elcmoIams06g57Xu2OScuAPihA8wNqkvdgSUTxJj2boIEnaQDGR1D15WhNJWNqPPS4A==
+      integrity: sha512-e+a+ULs+RLtRRqV/FDghXuuoV2d3jsgArafnFd8tE348UWkqrGmI2N6lcOkBHpQ5+mSSCpl3wT0ayC+wmlmM+Q==
       tarball: 'file:projects/keyvault-secrets.tgz'
     version: 0.0.0
   'file:projects/service-bus.tgz':
@@ -10420,7 +10420,7 @@ packages:
       cross-env: 5.2.0
       debug: 3.2.6
       delay: 4.3.0
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
       eslint-detailed-reporter: 0.8.0_eslint@5.16.0
@@ -10470,7 +10470,7 @@ packages:
     dev: false
     name: '@rush-temp/service-bus'
     resolution:
-      integrity: sha512-IckVg8CV310wLgunRCl2OAi+Nvn+GWQsHf3IDe2BoFOc/JzXKqC7/ETh98lua+jyePPL7ycdGhxxzzRCLieFIA==
+      integrity: sha512-tUY+4clZnQdMrD7mpzAxW/GBUiNStACPr/wk/ToXS08V/yRAXMHi7ljcNdMuZbkyBn3/nifiOlhjgsLnoQ7omQ==
       tarball: 'file:projects/service-bus.tgz'
     version: 0.0.0
   'file:projects/storage-blob.tgz':
@@ -10488,7 +10488,7 @@ packages:
       '@typescript-eslint/parser': 1.13.0_eslint@5.16.0
       assert: 1.5.0
       cross-env: 5.2.0
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       es6-promise: 4.2.8
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
@@ -10541,7 +10541,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-blob'
     resolution:
-      integrity: sha512-7gm0+9x+ftqH1gOfX9bVQqG3xSp8YOhy55adAv073zQOtCH8TH0LOVqH5+o4b6Jntsjy1CSaPdbmP/xCK24FXQ==
+      integrity: sha512-5KC/oczG4OJCdu73WljXC+6DPQPqwzvbhMhtwmNSvNiW7jMM6eHzrzGJK0n/00vic5fvqhUThm6tu3XZG1ZTSw==
       tarball: 'file:projects/storage-blob.tgz'
     version: 0.0.0
   'file:projects/storage-file.tgz':
@@ -10559,7 +10559,7 @@ packages:
       '@typescript-eslint/parser': 1.13.0_eslint@5.16.0
       assert: 1.5.0
       cross-env: 5.2.0
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       es6-promise: 4.2.8
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
@@ -10612,7 +10612,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-file'
     resolution:
-      integrity: sha512-p6FXuKOLY9zqWg4mqGXgoEZcOzfA4uQ8RWKB5b6HyBCvSDtmviKYgOqwjGd3fZyGT5QoaY9g0x0ztCP7XWNcOw==
+      integrity: sha512-fr9PugxrPIsBuXaXDe02j7E22Esqz+2e8lcbM0HIQDKRi3nxn+f4Hq60sQVOGsckT7weLB7XtQGS7dnEBNd2Cw==
       tarball: 'file:projects/storage-file.tgz'
     version: 0.0.0
   'file:projects/storage-queue.tgz':
@@ -10630,7 +10630,7 @@ packages:
       '@typescript-eslint/parser': 1.13.0_eslint@5.16.0
       assert: 1.5.0
       cross-env: 5.2.0
-      dotenv: 7.0.0
+      dotenv: 8.0.0
       es6-promise: 4.2.8
       eslint: 5.16.0
       eslint-config-prettier: 4.3.0_eslint@5.16.0
@@ -10682,7 +10682,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-queue'
     resolution:
-      integrity: sha512-JLrNUMeV03OgrviE774rsZlMot0F2jN3wtDrr5plPqR0i/FgMSciMfJRUmOiG3teTZo+u8fEgf2feBv+M0wSGA==
+      integrity: sha512-WP+VB28wLg441fESisDswzeIJEAkdEktRSBFSs1qhuT6e0jlSEzlkOjl6xbfVqvg4dlv/ra9TLH051E+lwrhCw==
       tarball: 'file:projects/storage-queue.tgz'
     version: 0.0.0
   'file:projects/template.tgz':
@@ -10845,7 +10845,7 @@ specifiers:
   death: ^1.1.0
   debug: ^3.1.0
   delay: ^4.2.0
-  dotenv: ^7.0.0
+  dotenv: ^8.0.0
   es6-promise: ^4.2.5
   eslint: ^5.16.0
   eslint-config-prettier: ^4.2.0
diff --git a/sdk/core/core-amqp/package.json b/sdk/core/core-amqp/package.json
index 13b82d121fe0..485df9449537 100644
--- a/sdk/core/core-amqp/package.json
+++ b/sdk/core/core-amqp/package.json
@@ -87,7 +87,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-detailed-reporter": "^0.8.0",
diff --git a/sdk/eventhub/event-hubs/package.json b/sdk/eventhub/event-hubs/package.json
index ceea6976292b..62d22156d12a 100644
--- a/sdk/eventhub/event-hubs/package.json
+++ b/sdk/eventhub/event-hubs/package.json
@@ -94,7 +94,7 @@
     "chai-as-promised": "^7.1.1",
     "chai-string": "^1.5.0",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-detailed-reporter": "^0.8.0",
diff --git a/sdk/eventhub/event-processor-host/package.json b/sdk/eventhub/event-processor-host/package.json
index a7af59b3fa2c..e47a28abdf49 100644
--- a/sdk/eventhub/event-processor-host/package.json
+++ b/sdk/eventhub/event-processor-host/package.json
@@ -59,10 +59,10 @@
   },
   "dependencies": {
     "@azure/event-hubs": "^2.1.1",
+    "@azure/ms-rest-nodeauth": "^0.9.2",
     "async-lock": "^1.1.3",
     "azure-storage": "^2.10.2",
     "debug": "^3.1.0",
-    "@azure/ms-rest-nodeauth": "^0.9.2",
     "path-browserify": "^1.0.0",
     "tslib": "^1.9.3",
     "uuid": "^3.3.2"
@@ -78,19 +78,21 @@
     "@types/mocha": "^5.2.5",
     "@types/node": "^8.0.0",
     "@types/uuid": "^3.4.3",
+    "@types/ws": "^6.0.1",
     "@typescript-eslint/eslint-plugin": "^1.11.0",
     "@typescript-eslint/parser": "^1.11.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-string": "^1.5.0",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-detailed-reporter": "^0.8.0",
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-no-only-tests": "^2.3.0",
     "eslint-plugin-promise": "^4.1.1",
+    "https-proxy-agent": "^2.2.1",
     "mocha": "^5.2.0",
     "mocha-junit-reporter": "^1.18.0",
     "mocha-multi": "^1.0.1",
@@ -107,8 +109,6 @@
     "rollup-plugin-uglify": "^6.0.0",
     "ts-node": "^7.0.1",
     "typescript": "^3.2.2",
-    "@types/ws": "^6.0.1",
-    "https-proxy-agent": "^2.2.1",
     "ws": "^6.2.1"
   }
 }
diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json
index 4eb3762788b0..9bc5fb4037d3 100644
--- a/sdk/keyvault/keyvault-keys/package.json
+++ b/sdk/keyvault/keyvault-keys/package.json
@@ -90,7 +90,7 @@
     "assert": "^1.4.1",
     "chai": "^4.2.0",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-detailed-reporter": "^0.8.0",
diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json
index b366c48f4fe7..0e41b5ba72c1 100644
--- a/sdk/keyvault/keyvault-secrets/package.json
+++ b/sdk/keyvault/keyvault-secrets/package.json
@@ -90,7 +90,7 @@
     "assert": "^1.4.1",
     "chai": "^4.2.0",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-detailed-reporter": "^0.8.0",
diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json
index c5be64f7b25e..bce25a8a1778 100644
--- a/sdk/servicebus/service-bus/package.json
+++ b/sdk/servicebus/service-bus/package.json
@@ -96,7 +96,7 @@
     "chai-as-promised": "^7.1.1",
     "cross-env": "^5.2.0",
     "delay": "^4.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
     "eslint-detailed-reporter": "^0.8.0",
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index 62d44163b789..ff5989662e2d 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -91,7 +91,7 @@
     "@typescript-eslint/parser": "^1.11.0",
     "assert": "^1.4.1",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "es6-promise": "^4.2.5",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
diff --git a/sdk/storage/storage-file/package.json b/sdk/storage/storage-file/package.json
index 3305b3022278..a7ef87ac1075 100644
--- a/sdk/storage/storage-file/package.json
+++ b/sdk/storage/storage-file/package.json
@@ -91,7 +91,7 @@
     "@typescript-eslint/parser": "^1.11.0",
     "assert": "^1.4.1",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "es6-promise": "^4.2.5",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",
diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
index eea144e36d2a..46d1e3407e0a 100644
--- a/sdk/storage/storage-queue/package.json
+++ b/sdk/storage/storage-queue/package.json
@@ -89,7 +89,7 @@
     "@typescript-eslint/parser": "^1.11.0",
     "assert": "^1.4.1",
     "cross-env": "^5.2.0",
-    "dotenv": "^7.0.0",
+    "dotenv": "^8.0.0",
     "es6-promise": "^4.2.5",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.2.0",

From 7d9c2753316b5721fbf4d9de82427f685aa5da64 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 29 Jul 2019 17:19:28 -0700
Subject: [PATCH 08/24] Update dev dependency gulp-zip to latest (#4511)

---
 common/config/rush/pnpm-lock.yaml      | 66 ++++++++++++++++++++------
 sdk/storage/storage-blob/package.json  |  2 +-
 sdk/storage/storage-file/package.json  |  2 +-
 sdk/storage/storage-queue/package.json |  2 +-
 4 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 513ce717f4bc..70649353e2a1 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -96,7 +96,7 @@ dependencies:
   fs-extra: 8.1.0
   glob: 7.1.4
   gulp: 4.0.2
-  gulp-zip: 4.2.0
+  gulp-zip: 5.0.0_gulp@4.0.2
   https-proxy-agent: 2.2.2
   inherits: 2.0.4
   is-buffer: 2.0.3
@@ -4185,6 +4185,14 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  /get-stream/5.1.0:
+    dependencies:
+      pump: 3.0.0
+    dev: false
+    engines:
+      node: '>=8'
+    resolution:
+      integrity: sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
   /get-value/2.0.6:
     dev: false
     engines:
@@ -4377,18 +4385,21 @@ packages:
     hasBin: true
     resolution:
       integrity: sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==
-  /gulp-zip/4.2.0:
+  /gulp-zip/5.0.0_gulp@4.0.2:
     dependencies:
-      get-stream: 3.0.0
-      plugin-error: 0.1.2
-      through2: 2.0.5
+      get-stream: 5.1.0
+      gulp: 4.0.2
+      plugin-error: 1.0.1
+      through2: 3.0.1
       vinyl: 2.2.0
       yazl: 2.5.1
     dev: false
     engines:
-      node: '>=4'
+      node: '>=8'
+    peerDependencies:
+      gulp: '>=4'
     resolution:
-      integrity: sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==
+      integrity: sha512-oR3t8kn+ccHkSyRcBV5kBLPXrhqTh5d6wBAR7r7wqjNQNBhYvOwPedCwlAaGcNl1qSeXNDn6qOk1Qyxvx9Wrow==
   /gulp/4.0.2:
     dependencies:
       glob-watcher: 5.0.3
@@ -7120,6 +7131,17 @@ packages:
       node: '>=0.10.0'
     resolution:
       integrity: sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
+  /plugin-error/1.0.1:
+    dependencies:
+      ansi-colors: 1.1.0
+      arr-diff: 4.0.0
+      arr-union: 3.1.0
+      extend-shallow: 3.0.2
+    dev: false
+    engines:
+      node: '>= 0.10'
+    resolution:
+      integrity: sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
   /posix-character-classes/0.1.1:
     dev: false
     engines:
@@ -7437,6 +7459,16 @@ packages:
     dev: false
     resolution:
       integrity: sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  /readable-stream/3.4.0:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.2.0
+      util-deprecate: 1.0.2
+    dev: false
+    engines:
+      node: '>= 6'
+    resolution:
+      integrity: sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
   /readdirp/2.2.1:
     dependencies:
       graceful-fs: 4.2.0
@@ -8734,6 +8766,12 @@ packages:
     dev: false
     resolution:
       integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  /through2/3.0.1:
+    dependencies:
+      readable-stream: 3.4.0
+    dev: false
+    resolution:
+      integrity: sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
   /time-stamp/1.1.0:
     dev: false
     engines:
@@ -10499,7 +10537,7 @@ packages:
       events: 3.0.0
       fs-extra: 8.1.0
       gulp: 4.0.2
-      gulp-zip: 4.2.0
+      gulp-zip: 5.0.0_gulp@4.0.2
       inherits: 2.0.4
       karma: 4.2.0
       karma-chrome-launcher: 2.2.0
@@ -10541,7 +10579,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-blob'
     resolution:
-      integrity: sha512-5KC/oczG4OJCdu73WljXC+6DPQPqwzvbhMhtwmNSvNiW7jMM6eHzrzGJK0n/00vic5fvqhUThm6tu3XZG1ZTSw==
+      integrity: sha512-oMEqXqmiRF6HYkZXU4o93bKkibi5RGs4iYwnSXE1QXA5uIFqU1oGvVxUMvZedk9DUCKOssRYOTFSrf0HCjy9dQ==
       tarball: 'file:projects/storage-blob.tgz'
     version: 0.0.0
   'file:projects/storage-file.tgz':
@@ -10570,7 +10608,7 @@ packages:
       events: 3.0.0
       fs-extra: 8.1.0
       gulp: 4.0.2
-      gulp-zip: 4.2.0
+      gulp-zip: 5.0.0_gulp@4.0.2
       inherits: 2.0.4
       karma: 4.2.0
       karma-chrome-launcher: 2.2.0
@@ -10612,7 +10650,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-file'
     resolution:
-      integrity: sha512-fr9PugxrPIsBuXaXDe02j7E22Esqz+2e8lcbM0HIQDKRi3nxn+f4Hq60sQVOGsckT7weLB7XtQGS7dnEBNd2Cw==
+      integrity: sha512-Tld5tho72inYm+jDPhQ85HvUmtd08K/oVBddhWT5MfgLbT+6BM6ZKMkyPgjCa/o2RsSR0NYPQSGijmdpfiDXKA==
       tarball: 'file:projects/storage-file.tgz'
     version: 0.0.0
   'file:projects/storage-queue.tgz':
@@ -10640,7 +10678,7 @@ packages:
       eslint-plugin-promise: 4.2.1
       fs-extra: 8.1.0
       gulp: 4.0.2
-      gulp-zip: 4.2.0
+      gulp-zip: 5.0.0_gulp@4.0.2
       inherits: 2.0.4
       karma: 4.2.0
       karma-chrome-launcher: 2.2.0
@@ -10682,7 +10720,7 @@ packages:
     dev: false
     name: '@rush-temp/storage-queue'
     resolution:
-      integrity: sha512-WP+VB28wLg441fESisDswzeIJEAkdEktRSBFSs1qhuT6e0jlSEzlkOjl6xbfVqvg4dlv/ra9TLH051E+lwrhCw==
+      integrity: sha512-71xJVOcx25+m4X852HbknjV1kMpt0itdtxhTPF804gVomy4Ymrj8AQhwAmMVzzt3Q/+5LU51VpLtH10FF5Hxfg==
       tarball: 'file:projects/storage-queue.tgz'
     version: 0.0.0
   'file:projects/template.tgz':
@@ -10860,7 +10898,7 @@ specifiers:
   fs-extra: ^8.1.0
   glob: ^7.1.2
   gulp: ^4.0.0
-  gulp-zip: ^4.2.0
+  gulp-zip: ^5.0.0
   https-proxy-agent: ^2.2.1
   inherits: ^2.0.3
   is-buffer: ^2.0.3
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index ff5989662e2d..8d9f29c012e6 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -101,7 +101,7 @@
     "eslint-plugin-promise": "^4.1.1",
     "fs-extra": "^8.1.0",
     "gulp": "^4.0.0",
-    "gulp-zip": "^4.2.0",
+    "gulp-zip": "^5.0.0",
     "inherits": "^2.0.3",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^2.2.0",
diff --git a/sdk/storage/storage-file/package.json b/sdk/storage/storage-file/package.json
index a7ef87ac1075..2b0d9676db17 100644
--- a/sdk/storage/storage-file/package.json
+++ b/sdk/storage/storage-file/package.json
@@ -101,7 +101,7 @@
     "eslint-plugin-promise": "^4.1.1",
     "fs-extra": "^8.1.0",
     "gulp": "^4.0.0",
-    "gulp-zip": "^4.2.0",
+    "gulp-zip": "^5.0.0",
     "inherits": "^2.0.3",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^2.2.0",
diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
index 46d1e3407e0a..84f31f211ba5 100644
--- a/sdk/storage/storage-queue/package.json
+++ b/sdk/storage/storage-queue/package.json
@@ -99,7 +99,7 @@
     "eslint-plugin-promise": "^4.1.1",
     "fs-extra": "^8.1.0",
     "gulp": "^4.0.0",
-    "gulp-zip": "^4.2.0",
+    "gulp-zip": "^5.0.0",
     "inherits": "^2.0.3",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^2.2.0",

From 3d1475c417d231c3ff56bbc1c816d50045f876f1 Mon Sep 17 00:00:00 2001
From: ShivangiReja <45216704+ShivangiReja@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:28:46 -0700
Subject: [PATCH 09/24] [EPH] Call methods on PartitionProcessor while
 processing single partition (#4467)

* [EPH] Call methods on PartitionProcessor while processing single partition
---
 .../event-hubs/review/event-hubs.api.md       | 20 ++++
 .../event-hubs/samples/eventProcessor.ts      | 71 +++++++++++++
 sdk/eventhub/event-hubs/src/eventProcessor.ts | 57 ++++++++++-
 sdk/eventhub/event-hubs/src/index.ts          |  2 +
 sdk/eventhub/event-hubs/src/log.ts            |  5 +
 sdk/eventhub/event-hubs/src/partitionPump.ts  | 89 +++++++++++++++++
 .../event-hubs/test/eventProcessor.spec.ts    | 99 +++++++++++++++++++
 7 files changed, 339 insertions(+), 4 deletions(-)
 create mode 100644 sdk/eventhub/event-hubs/samples/eventProcessor.ts
 create mode 100644 sdk/eventhub/event-hubs/src/partitionPump.ts
 create mode 100644 sdk/eventhub/event-hubs/test/eventProcessor.spec.ts

diff --git a/sdk/eventhub/event-hubs/review/event-hubs.api.md b/sdk/eventhub/event-hubs/review/event-hubs.api.md
index 2df4c943a29e..0423821806b9 100644
--- a/sdk/eventhub/event-hubs/review/event-hubs.api.md
+++ b/sdk/eventhub/event-hubs/review/event-hubs.api.md
@@ -146,6 +146,16 @@ export class EventPosition {
     sequenceNumber?: number;
     }
 
+// @public
+export class EventProcessor {
+    // Warning: (ae-forgotten-export) The symbol "PartitionProcessorFactory" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "PartitionManager" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "EventProcessorOptions" needs to be exported by the entry point index.d.ts
+    constructor(consumerGroupName: string, eventHubClient: EventHubClient, partitionProcessorFactory: PartitionProcessorFactory, partitionManager: PartitionManager, options?: EventProcessorOptions);
+    start(): Promise<void>;
+    stop(): Promise<void>;
+}
+
 export { MessagingError }
 
 // @public
@@ -154,6 +164,16 @@ export type OnError = (error: MessagingError | Error) => void;
 // @public
 export type OnMessage = (eventData: ReceivedEventData) => void;
 
+// @public
+export interface PartitionContext {
+    // (undocumented)
+    readonly consumerGroupName: string;
+    // (undocumented)
+    readonly eventHubName: string;
+    // (undocumented)
+    readonly partitionId: string;
+}
+
 // @public
 export interface PartitionProperties {
     beginningSequenceNumber: number;
diff --git a/sdk/eventhub/event-hubs/samples/eventProcessor.ts b/sdk/eventhub/event-hubs/samples/eventProcessor.ts
new file mode 100644
index 000000000000..9015fe7cf592
--- /dev/null
+++ b/sdk/eventhub/event-hubs/samples/eventProcessor.ts
@@ -0,0 +1,71 @@
+import {
+  EventHubClient,
+  EventData,
+  EventPosition,
+  delay,
+  EventProcessor,
+  PartitionContext
+} from "@azure/event-hubs";
+
+class SimplePartitionProcessor {
+  private _context: PartitionContext;
+  constructor(context: PartitionContext) {
+    this._context = context;
+  }
+  async processEvents(events: EventData[]) {
+    for (const event of events) {
+      console.log(
+        "Received event: '%s' from partition: '%s' and consumer group: '%s'",
+        event.body,
+        this._context.partitionId,
+        this._context.consumerGroupName
+      );
+    }
+  }
+
+  async processError(error: Error) {
+    console.log(`Encountered an error: ${error.message}`);
+  }
+
+  async initialize() {
+    console.log(`Started processing`);
+  }
+
+  async close() {
+    console.log(`Stopped processing`);
+  }
+}
+
+// Define connection string and related Event Hubs entity name here
+const connectionString = "";
+const eventHubName = "";
+
+async function main() {
+  const client = new EventHubClient(connectionString, eventHubName);
+
+  const eventProcessorFactory = (context: PartitionContext) => {
+    return new SimplePartitionProcessor(context);
+  };
+
+  const processor = new EventProcessor(
+    EventHubClient.defaultConsumerGroupName,
+    client,
+    eventProcessorFactory,
+    "partitionManager" as any,
+    {
+      initialEventPosition: EventPosition.earliest(),
+      maxBatchSize: 10,
+      maxWaitTimeInSeconds: 20
+    }
+  );
+  await processor.start();
+  // after 2 seconds, stop processing
+  await delay(2000);
+
+  await processor.stop();
+  await client.close();
+}
+
+main().catch((err) => {
+  console.log("Error occurred: ", err);
+});
diff --git a/sdk/eventhub/event-hubs/src/eventProcessor.ts b/sdk/eventhub/event-hubs/src/eventProcessor.ts
index 8a9ebc04ca6b..285fb43b1043 100644
--- a/sdk/eventhub/event-hubs/src/eventProcessor.ts
+++ b/sdk/eventhub/event-hubs/src/eventProcessor.ts
@@ -6,6 +6,7 @@ import { EventPosition } from "./eventPosition";
 import { PartitionContext } from "./partitionContext";
 import { CheckpointManager, Checkpoint } from "./checkpointManager";
 import { EventData } from "./eventData";
+import { PartitionPump } from "./partitionPump";
 
 export interface PartitionProcessor {
   /**
@@ -66,7 +67,7 @@ export interface PartitionManager {
 export interface EventProcessorOptions {
   initialEventPosition?: EventPosition;
   maxBatchSize?: number;
-  maxWaitTime?: number;
+  maxWaitTimeInSeconds?: number;
 }
 
 /**
@@ -74,13 +75,26 @@ export interface EventProcessorOptions {
  * @class EventProcessorHost
  */
 export class EventProcessor {
+  private _consumerGroupName: string;
+  private _eventHubClient: EventHubClient;
+  private _partitionProcessorFactory: PartitionProcessorFactory;
+  private _processorOptions: EventProcessorOptions;
+  private _partitionPump?: PartitionPump;
+
   constructor(
     consumerGroupName: string,
     eventHubClient: EventHubClient,
     partitionProcessorFactory: PartitionProcessorFactory,
     partitionManager: PartitionManager,
     options?: EventProcessorOptions
-  ) {}
+  ) {
+    if (!options) options = {};
+
+    this._consumerGroupName = consumerGroupName;
+    this._eventHubClient = eventHubClient;
+    this._partitionProcessorFactory = partitionProcessorFactory;
+    this._processorOptions = options;
+  }
 
   /**
    * Starts the event processor, fetching the list of partitions, and attempting to grab leases
@@ -89,11 +103,46 @@ export class EventProcessor {
    *
    * @return {Promise<void>}
    */
-  async start(): Promise<void> {}
+  async start(): Promise<void> {
+    const partitionIds = await this._eventHubClient.getPartitionIds();
+    const partitionContext: PartitionContext = {
+      partitionId: partitionIds[0],
+      consumerGroupName: this._consumerGroupName,
+      eventHubName: this._eventHubClient.eventHubName
+    };
+    const partitionProcessor = this._partitionProcessorFactory(
+      partitionContext,
+      new CheckpointManager()
+    );
+    if (partitionProcessor.initialize && typeof partitionProcessor.initialize !== "function") {
+      throw new TypeError("'initialize' must be of type 'function'.");
+    }
+    if (typeof partitionProcessor.processEvents !== "function") {
+      throw new TypeError("'processEvents' is required and must be of type 'function'.");
+    }
+    if (typeof partitionProcessor.processError !== "function") {
+      throw new TypeError("'processError' is required and must be of type 'function'.");
+    }
+    if (partitionProcessor.close && typeof partitionProcessor.close !== "function") {
+      throw new TypeError("'close' must be of type 'function'.");
+    }
+
+    this._partitionPump = new PartitionPump(
+      this._eventHubClient,
+      partitionContext,
+      partitionProcessor,
+      this._processorOptions
+    );
+    await this._partitionPump.start(partitionIds[0]);
+  }
 
   /**
    * Stops the EventProcessor from processing messages.
    * @return {Promise<void>}
    */
-  async stop(): Promise<void> {}
+  async stop(): Promise<void> {
+    if (this._partitionPump) {
+      await this._partitionPump.stop("Stopped processing");
+    }
+  }
 }
diff --git a/sdk/eventhub/event-hubs/src/index.ts b/sdk/eventhub/event-hubs/src/index.ts
index fed523ce7598..e00a632b0fd2 100644
--- a/sdk/eventhub/event-hubs/src/index.ts
+++ b/sdk/eventhub/event-hubs/src/index.ts
@@ -21,6 +21,8 @@ export { PartitionProperties, EventHubProperties } from "./managementClient";
 export { EventHubProducer } from "./sender";
 export { EventHubConsumer, EventIteratorOptions } from "./receiver";
 export { EventDataBatch } from "./eventDataBatch";
+export { EventProcessor } from "./eventProcessor";
+export { PartitionContext } from "./partitionContext";
 export {
   MessagingError,
   DataTransformer,
diff --git a/sdk/eventhub/event-hubs/src/log.ts b/sdk/eventhub/event-hubs/src/log.ts
index 3c0b0d91fc61..6f8610aeceb0 100644
--- a/sdk/eventhub/event-hubs/src/log.ts
+++ b/sdk/eventhub/event-hubs/src/log.ts
@@ -53,3 +53,8 @@ export const client = debugModule("azure:event-hubs:client");
  * log statements for iothub client
  */
 export const iotClient = debugModule("azure:event-hubs:iothubClient");
+/**
+ * @ignore
+ * log statements for partitionManager
+ */
+export const partitionPump = debugModule("azure:event-hubs:partitionPump");
diff --git a/sdk/eventhub/event-hubs/src/partitionPump.ts b/sdk/eventhub/event-hubs/src/partitionPump.ts
new file mode 100644
index 000000000000..cd55e47949e6
--- /dev/null
+++ b/sdk/eventhub/event-hubs/src/partitionPump.ts
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as log from "./log";
+import { EventProcessorOptions, PartitionProcessor } from "./eventProcessor";
+import { PartitionContext } from "./partitionContext";
+import { EventHubClient } from "./eventHubClient";
+import { EventPosition } from "./eventPosition";
+import { EventHubConsumer } from "./receiver";
+import { AbortController } from "@azure/abort-controller";
+
+export class PartitionPump {
+  private _partitionContext: PartitionContext;
+  private _eventHubClient: EventHubClient;
+  private _partitionProcessor: PartitionProcessor;
+  private _processorOptions: EventProcessorOptions;
+  private _receiver: EventHubConsumer | undefined;
+  private _isReceiving: boolean = false;
+  private _abortController: AbortController;
+
+  constructor(
+    eventHubClient: EventHubClient,
+    partitionContext: PartitionContext,
+    partitionProcessor: PartitionProcessor,
+    options?: EventProcessorOptions
+  ) {
+    if (!options) options = {};
+    this._eventHubClient = eventHubClient;
+    this._partitionContext = partitionContext;
+    this._partitionProcessor = partitionProcessor;
+    this._processorOptions = options;
+    this._abortController = new AbortController();
+  }
+
+  async start(partitionId: string): Promise<void> {
+    if (this._partitionProcessor.initialize) {
+      await this._partitionProcessor.initialize();
+    }
+    this._receiveEvents(partitionId);
+    log.partitionPump("Successfully started the receiver.");
+  }
+
+  private async _receiveEvents(partitionId: string): Promise<void> {
+    this._isReceiving = true;
+    try {
+      this._receiver = await this._eventHubClient.createConsumer(
+        this._partitionContext.consumerGroupName,
+        partitionId,
+        this._processorOptions.initialEventPosition || EventPosition.earliest()
+      );
+
+      while (this._isReceiving) {
+        const receivedEvents = await this._receiver.receiveBatch(
+          this._processorOptions.maxBatchSize || 1,
+          this._processorOptions.maxWaitTimeInSeconds,
+          this._abortController.signal
+        );
+        await this._partitionProcessor.processEvents(receivedEvents);
+      }
+    } catch (err) {
+      this._isReceiving = false;
+      try {
+        if (this._receiver) {
+          await this._receiver.close();
+        }
+        await this._partitionProcessor.processError(err);
+        log.error("An error occurred while receiving events.", err);
+      } catch (err) {
+        log.error("An error occurred while closing the receiver", err);
+      }
+    }
+  }
+
+  async stop(reason: string): Promise<void> {
+    this._isReceiving = false;
+    try {
+      if (this._receiver) {
+        await this._receiver.close();
+      }
+      this._abortController.abort();
+      if (this._partitionProcessor.close) {
+        await this._partitionProcessor.close(reason);
+      }
+    } catch (err) {
+      log.error("An error occurred while closing the receiver.", err);
+      throw err;
+    }
+  }
+}
diff --git a/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts b/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts
new file mode 100644
index 000000000000..2fdb84605c45
--- /dev/null
+++ b/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import chai from "chai";
+const should = chai.should();
+import chaiAsPromised from "chai-as-promised";
+chai.use(chaiAsPromised);
+import debugModule from "debug";
+const debug = debugModule("azure:event-hubs:partitionPump");
+import {
+  EventPosition,
+  EventHubClient,
+  EventData,
+  EventProcessor,
+  PartitionContext,
+  delay
+} from "../src";
+import { EnvVarKeys, getEnvVars } from "./utils/testUtils";
+const env = getEnvVars();
+
+describe("Event Processor", function(): void {
+  const service = {
+    connectionString: env[EnvVarKeys.EVENTHUB_CONNECTION_STRING],
+    path: env[EnvVarKeys.EVENTHUB_NAME]
+  };
+  const client: EventHubClient = new EventHubClient(service.connectionString, service.path);
+  before("validate environment", async function(): Promise<void> {
+    should.exist(
+      env[EnvVarKeys.EVENTHUB_CONNECTION_STRING],
+      "define EVENTHUB_CONNECTION_STRING in your environment before running integration tests."
+    );
+    should.exist(
+      env[EnvVarKeys.EVENTHUB_NAME],
+      "define EVENTHUB_NAME in your environment before running integration tests."
+    );
+  });
+
+  after("close the connection", async function(): Promise<void> {
+    await client.close();
+  });
+
+  describe("Partition processor", function(): void {
+    it("should call methods on a PartitionProcessor ", async function(): Promise<void> {
+      const receivedEvents: EventData[] = [];
+      let isinitializeCalled = false;
+      let isCloseCalled = false;
+      class SimpleEventProcessor {
+        async initialize() {
+          isinitializeCalled = true;
+          debug(`Started processing`);
+        }
+        async processEvents(events: EventData[]) {
+          for (const event of events) {
+            receivedEvents.push(event);
+            debug("Received event", event.body);
+          }
+        }
+
+        async processError(error: Error) {
+          debug(`Encountered an error: ${error.message}`);
+        }
+
+        async close() {
+          isCloseCalled = true;
+          debug(`Stopped processing`);
+        }
+      }
+      const eventProcessorFactory = (context: PartitionContext) => {
+        return new SimpleEventProcessor();
+      };
+      const partitionInfo = await client.getPartitionProperties("0");
+      const processor = new EventProcessor(
+        EventHubClient.defaultConsumerGroupName,
+        client,
+        eventProcessorFactory,
+        "partitionManager" as any,
+        {
+          initialEventPosition: EventPosition.fromSequenceNumber(
+            partitionInfo.lastEnqueuedSequenceNumber
+          ),
+          maxBatchSize: 1,
+          maxWaitTimeInSeconds: 5
+        }
+      );
+      const producer = client.createProducer({ partitionId: "0" });
+      await producer.send({ body: "Hello world!!!" });
+
+      await processor.start();
+      // after 2 seconds, stop processing
+      await delay(2000);
+      await processor.stop();
+      await producer.close();
+      isinitializeCalled.should.equal(true);
+      receivedEvents.length.should.equal(1);
+      receivedEvents[0].body.should.equal("Hello world!!!");
+      isCloseCalled.should.equal(true);
+    });
+  });
+}).timeout(90000);

From cb9e00e31edb2f620dbc1320588a7c5816961d8a Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 29 Jul 2019 18:35:56 -0700
Subject: [PATCH 10/24] Remove dev dependency opn-cli (#4516)

---
 common/config/rush/pnpm-lock.yaml | 83 ++-----------------------------
 sdk/core/core-arm/package.json    |  2 -
 sdk/core/core-http/package.json   |  1 -
 3 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 70649353e2a1..da77b9169ea8 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -133,7 +133,6 @@ dependencies:
   nock: 10.0.6
   npm-run-all: 4.1.5
   nyc: 14.1.1
-  opn-cli: 4.1.0
   path-browserify: 1.0.0
   prettier: 1.18.2
   priorityqueuejs: 1.0.0
@@ -2176,7 +2175,7 @@ packages:
   /browserslist/3.2.8:
     dependencies:
       caniuse-lite: 1.0.30000986
-      electron-to-chromium: 1.3.203
+      electron-to-chromium: 1.3.204
     dev: false
     hasBin: true
     resolution:
@@ -3225,10 +3224,10 @@ packages:
     dev: false
     resolution:
       integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-  /electron-to-chromium/1.3.203:
+  /electron-to-chromium/1.3.204:
     dev: false
     resolution:
-      integrity: sha512-Z1FjJKEBhYrCNmnususVk8khiBabVI/bSJB/295V4ghVt4MFmtbP+mXgRZLQZinEBI469U6FtiGgpXnlLs6qiQ==
+      integrity: sha512-T0eXE6hfbtpzRUaI7aHI/HYJ29Ndk84aVSborRAmXfWvBvz2EuB2OWYUxNcUX9d+jtqEIjgZjWMdoxS0hp5j1g==
   /elliptic/6.5.0:
     dependencies:
       bn.js: 4.11.8
@@ -3845,12 +3844,6 @@ packages:
       node: '>=4'
     resolution:
       integrity: sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  /file-type/10.11.0:
-    dev: false
-    engines:
-      node: '>=6'
-    resolution:
-      integrity: sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
   /fill-range/4.0.0:
     dependencies:
       extend-shallow: 2.0.1
@@ -5832,14 +5825,6 @@ packages:
     dev: false
     resolution:
       integrity: sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
-  /make-dir/1.3.0:
-    dependencies:
-      pify: 3.0.0
-    dev: false
-    engines:
-      node: '>=4'
-    resolution:
-      integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   /make-dir/2.1.0:
     dependencies:
       pify: 4.0.1
@@ -6020,22 +6005,6 @@ packages:
       node: '>=4'
     resolution:
       integrity: sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
-  /meow/5.0.0:
-    dependencies:
-      camelcase-keys: 4.2.0
-      decamelize-keys: 1.1.0
-      loud-rejection: 1.6.0
-      minimist-options: 3.0.2
-      normalize-package-data: 2.5.0
-      read-pkg-up: 3.0.0
-      redent: 2.0.0
-      trim-newlines: 2.0.0
-      yargs-parser: 10.1.0
-    dev: false
-    engines:
-      node: '>=6'
-    resolution:
-      integrity: sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
   /merge-descriptors/1.0.1:
     dev: false
     resolution:
@@ -6696,19 +6665,6 @@ packages:
       node: '>=8'
     resolution:
       integrity: sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
-  /opn-cli/4.1.0:
-    dependencies:
-      file-type: 10.11.0
-      get-stdin: 6.0.0
-      meow: 5.0.0
-      open: 6.4.0
-      temp-write: 3.4.0
-    dev: false
-    engines:
-      node: '>=8'
-    hasBin: true
-    resolution:
-      integrity: sha512-nVJ9dVb4fEKtmACWxUql+hhQxVWMt7BSRT+6TnB85W3xs5Pgk9sKW3icYeCIwOtOKALBw/6WUCoNmI1+ADfAow==
   /optimist/0.6.1:
     dependencies:
       minimist: 0.0.10
@@ -8676,25 +8632,6 @@ packages:
       node: '>=6'
     resolution:
       integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-  /temp-dir/1.0.0:
-    dev: false
-    engines:
-      node: '>=4'
-    resolution:
-      integrity: sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
-  /temp-write/3.4.0:
-    dependencies:
-      graceful-fs: 4.2.0
-      is-stream: 1.1.0
-      make-dir: 1.3.0
-      pify: 3.0.0
-      temp-dir: 1.0.0
-      uuid: 3.3.2
-    dev: false
-    engines:
-      node: '>=4'
-    resolution:
-      integrity: sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI=
   /terser-webpack-plugin/1.3.0_webpack@4.38.0:
     dependencies:
       cacache: 11.3.3
@@ -9589,12 +9526,6 @@ packages:
     dev: false
     resolution:
       integrity: sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
-  /yargs-parser/10.1.0:
-    dependencies:
-      camelcase: 4.1.0
-    dev: false
-    resolution:
-      integrity: sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   /yargs-parser/13.1.1:
     dependencies:
       camelcase: 5.3.1
@@ -9858,7 +9789,6 @@ packages:
       mocha-multi-reporters: 1.1.7
       npm-run-all: 4.1.5
       nyc: 14.1.1
-      opn-cli: 4.1.0
       rimraf: 2.6.3
       rollup: 1.17.0
       rollup-plugin-node-resolve: 5.2.0_rollup@1.17.0
@@ -9874,7 +9804,7 @@ packages:
     dev: false
     name: '@rush-temp/core-arm'
     resolution:
-      integrity: sha512-ydCkKGPwdsqk3cZtb5s+PlhnUJNHifGymT1Rh6PjJCVoOOXGTXqZYc4k/EI9DMk/sgI4Vo9cQknrmjG5hRz5dw==
+      integrity: sha512-1sOGfOod5UwbFF8cs0IekpFq9Zne5DIWp+lpG7Isjn7/io2udgugy3ciY7e2XcikZk34wctC8zHQiPul6G9nhg==
       tarball: 'file:projects/core-arm.tgz'
     version: 0.0.0
   'file:projects/core-asynciterator-polyfill.tgz':
@@ -9983,7 +9913,6 @@ packages:
       mocha-multi-reporters: 1.1.7
       npm-run-all: 4.1.5
       nyc: 14.1.1
-      opn-cli: 4.1.0
       process: 0.11.10
       puppeteer: 1.19.0
       rimraf: 2.6.3
@@ -10016,7 +9945,7 @@ packages:
     dev: false
     name: '@rush-temp/core-http'
     resolution:
-      integrity: sha512-pYmI7WimQIGJwIiiOP0xeyV1gSAJfCzUEhrCOVNmG8jvYFqXYUuqHAlGq/N02i+oRh/c+wM07H3Mv/kyCScomQ==
+      integrity: sha512-ykXa+d0rGhwA3mG9JPPf+iKky71Qa2LjflLenGtR78FMTgcDkvq6QmGJ793uZUN5SKu5iXk0CMGYPrngzfx31g==
       tarball: 'file:projects/core-http.tgz'
     version: 0.0.0
   'file:projects/core-paging.tgz':
@@ -10799,7 +10728,6 @@ packages:
       integrity: sha512-rdhMvXi7mvg+wP0vVdqhouZr17v9a3n4KDMSyuUPU9qhOvY6bMfqoeIXrzgWkCXtR9yjL15gwJHKWsBlByGE4A==
       tarball: 'file:projects/testhub.tgz'
     version: 0.0.0
-registry: ''
 specifiers:
   '@azure/abort-controller': 1.0.0-preview.1
   '@azure/amqp-common': 1.0.0-preview.6
@@ -10935,7 +10863,6 @@ specifiers:
   nock: ^10.0.6
   npm-run-all: ^4.1.5
   nyc: ^14.0.0
-  opn-cli: ^4.0.0
   path-browserify: ^1.0.0
   prettier: ^1.16.4
   priorityqueuejs: 1.0.0
diff --git a/sdk/core/core-arm/package.json b/sdk/core/core-arm/package.json
index c8985167f5d6..819cb1a7c7ec 100644
--- a/sdk/core/core-arm/package.json
+++ b/sdk/core/core-arm/package.json
@@ -63,7 +63,6 @@
     "mocha-multi-reporters": "^1.1.7",
     "npm-run-all": "^4.1.5",
     "nyc": "^14.0.0",
-    "opn-cli": "^4.0.0",
     "rimraf": "^2.6.2",
     "rollup": "^1.16.3",
     "rollup-plugin-node-resolve": "^5.0.2",
@@ -121,7 +120,6 @@
     "unit-test": "npm run unit-test:node && npm run unit-test:browser",
     "unit-test:browser": "echo skipped",
     "unit-test:node": "nyc mocha",
-    "test:coverage": "npm run test && opn coverage/index.html",
     "pack": "npm pack 2>&1",
     "prebuild": "npm run clean"
   },
diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json
index cc837b10867f..1c41cc4012e2 100644
--- a/sdk/core/core-http/package.json
+++ b/sdk/core/core-http/package.json
@@ -163,7 +163,6 @@
     "mocha-multi-reporters": "^1.1.7",
     "npm-run-all": "^4.1.5",
     "nyc": "^14.0.0",
-    "opn-cli": "^4.0.0",
     "puppeteer": "^1.11.0",
     "rimraf": "^2.6.2",
     "rollup": "^1.16.3",

From 850d6537ebf792a49de4dc3a8cde897b672aef89 Mon Sep 17 00:00:00 2001
From: ramya0820 <45977823+ramya0820@users.noreply.github.com>
Date: Mon, 29 Jul 2019 21:22:22 -0700
Subject: [PATCH 11/24] [Event Hubs] Update try/catch in management requests
 (#4515)

---
 .../event-hubs/src/managementClient.ts        | 119 +++++++++---------
 1 file changed, 58 insertions(+), 61 deletions(-)

diff --git a/sdk/eventhub/event-hubs/src/managementClient.ts b/sdk/eventhub/event-hubs/src/managementClient.ts
index 8b85ab83bfc0..66cae060d583 100644
--- a/sdk/eventhub/event-hubs/src/managementClient.ts
+++ b/sdk/eventhub/event-hubs/src/managementClient.ts
@@ -318,84 +318,81 @@ export class ManagementClient extends LinkEntity {
 
       const sendOperationPromise = () =>
         new Promise<Message>(async (resolve, reject) => {
-          try {
-            let count = 0;
+          let count = 0;
 
-            const retryTimeoutInMs = getRetryAttemptTimeoutInMs(options.retryOptions);
-            let timeTakenByInit = 0;
+          const retryTimeoutInMs = getRetryAttemptTimeoutInMs(options.retryOptions);
+          let timeTakenByInit = 0;
 
-            const rejectOnAbort = () => {
-              const requestName = options.requestName;
-              const desc: string =
-                `[${this._context.connectionId}] The request "${requestName}" ` +
-                `to has been cancelled by the user.`;
-              log.error(desc);
-              const error = new AbortError(
-                `The ${
-                  requestName ? requestName + " " : ""
-                }operation has been cancelled by the user.`
-              );
+          const rejectOnAbort = () => {
+            const requestName = options.requestName;
+            const desc: string =
+              `[${this._context.connectionId}] The request "${requestName}" ` +
+              `to has been cancelled by the user.`;
+            log.error(desc);
+            const error = new AbortError(
+              `The ${requestName ? requestName + " " : ""}operation has been cancelled by the user.`
+            );
 
-              reject(error);
-            };
+            reject(error);
+          };
 
-            if (aborter) {
-              if (aborter.aborted) {
-                return rejectOnAbort();
-              }
+          if (aborter) {
+            if (aborter.aborted) {
+              return rejectOnAbort();
             }
+          }
 
-            if (!this._isMgmtRequestResponseLinkOpen()) {
-              log.mgmt(
-                "[%s] Acquiring lock to get the management req res link.",
-                this._context.connectionId
-              );
-
-              const initOperationStartTime = Date.now();
+          if (!this._isMgmtRequestResponseLinkOpen()) {
+            log.mgmt(
+              "[%s] Acquiring lock to get the management req res link.",
+              this._context.connectionId
+            );
 
-              const actionAfterTimeout = () => {
-                const desc: string = `The request with message_id "${request.message_id}" timed out. Please try again later.`;
-                const e: Error = {
-                  name: "OperationTimeoutError",
-                  message: desc
-                };
+            const initOperationStartTime = Date.now();
 
-                return reject(translate(e));
+            const actionAfterTimeout = () => {
+              const desc: string = `The request with message_id "${request.message_id}" timed out. Please try again later.`;
+              const e: Error = {
+                name: "OperationTimeoutError",
+                message: desc
               };
 
-              const waitTimer = setTimeout(actionAfterTimeout, retryTimeoutInMs);
+              return reject(translate(e));
+            };
+
+            const waitTimer = setTimeout(actionAfterTimeout, retryTimeoutInMs);
 
-              try {
-                await defaultLock.acquire(this.managementLock, () => {
-                  return this._init();
-                });
-              } catch (err) {
-                return reject(translate(err));
-              } finally {
-                clearTimeout(waitTimer);
-              }
-              timeTakenByInit = Date.now() - initOperationStartTime;
+            try {
+              await defaultLock.acquire(this.managementLock, () => {
+                return this._init();
+              });
+            } catch (err) {
+              return reject(translate(err));
+            } finally {
+              clearTimeout(waitTimer);
             }
+            timeTakenByInit = Date.now() - initOperationStartTime;
+          }
 
-            const remainingOperationTimeoutInMs = retryTimeoutInMs - timeTakenByInit;
+          const remainingOperationTimeoutInMs = retryTimeoutInMs - timeTakenByInit;
 
-            const sendRequestOptions: SendRequestOptions = {
-              abortSignal: options.abortSignal,
-              requestName: options.requestName,
-              timeoutInSeconds: remainingOperationTimeoutInMs / 1000
-            };
+          const sendRequestOptions: SendRequestOptions = {
+            abortSignal: options.abortSignal,
+            requestName: options.requestName,
+            timeoutInSeconds: remainingOperationTimeoutInMs / 1000
+          };
 
-            count++;
-            if (count !== 1) {
-              // Generate a new message_id every time after the first attempt
-              request.message_id = generate_uuid();
-            } else if (!request.message_id) {
-              // Set the message_id in the first attempt only if it is not set
-              request.message_id = generate_uuid();
-            }
+          count++;
+          if (count !== 1) {
+            // Generate a new message_id every time after the first attempt
+            request.message_id = generate_uuid();
+          } else if (!request.message_id) {
+            // Set the message_id in the first attempt only if it is not set
+            request.message_id = generate_uuid();
+          }
 
+          try {
             const result = await this._mgmtReqResLink!.sendRequest(request, sendRequestOptions);
-
             resolve(result);
           } catch (err) {
             err = translate(err);

From a1cd8e7579375aa14cd2ce313b4819e49de90963 Mon Sep 17 00:00:00 2001
From: David Wilson <daviwil@microsoft.com>
Date: Tue, 30 Jul 2019 11:23:27 -0700
Subject: [PATCH 12/24] [Identity] Add UsernamePasswordCredential for
 username/password authentication (#4404)

* Add UsernamePasswordCredential for username/password authentication

* Enforce https for IdentityClient's authorityHost option

* Make sure https actually ends with a ':'
---
 .../identity/src/client/identityClient.ts     |  4 +
 .../credentials/usernamePasswordCredential.ts | 82 +++++++++++++++++++
 sdk/identity/identity/src/index.ts            |  1 +
 .../identity/test/identityClient.spec.ts      | 12 +++
 .../test/usernamePasswordCredential.spec.ts   | 48 +++++++++++
 5 files changed, 147 insertions(+)
 create mode 100644 sdk/identity/identity/src/credentials/usernamePasswordCredential.ts
 create mode 100644 sdk/identity/identity/test/usernamePasswordCredential.spec.ts

diff --git a/sdk/identity/identity/src/client/identityClient.ts b/sdk/identity/identity/src/client/identityClient.ts
index 36bc1cfb7db9..d9ff32589a36 100644
--- a/sdk/identity/identity/src/client/identityClient.ts
+++ b/sdk/identity/identity/src/client/identityClient.ts
@@ -20,6 +20,10 @@ export class IdentityClient extends ServiceClient {
     super(undefined, options);
 
     this.baseUri = this.authorityHost = options.authorityHost;
+
+    if (!this.baseUri.startsWith("https:")) {
+      throw new Error("The authorityHost address must use the 'https' protocol.");
+    }
   }
 
   createWebResource(requestOptions: RequestPrepareOptions): WebResource {
diff --git a/sdk/identity/identity/src/credentials/usernamePasswordCredential.ts b/sdk/identity/identity/src/credentials/usernamePasswordCredential.ts
new file mode 100644
index 000000000000..427be842e2b9
--- /dev/null
+++ b/sdk/identity/identity/src/credentials/usernamePasswordCredential.ts
@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import qs from "qs";
+import { TokenCredential, GetTokenOptions, AccessToken } from "@azure/core-http";
+import { IdentityClientOptions, IdentityClient } from "../client/identityClient";
+
+/**
+ * Enables authentication to Azure Active Directory using a user's
+ * username and password. This credential requires a high degree of
+ * trust you should only use it when other, more secure, credentials
+ * can't be used.
+ */
+export class UsernamePasswordCredential implements TokenCredential {
+  private identityClient: IdentityClient;
+  private tenantId: string;
+  private clientId: string;
+  private username: string;
+  private password: string;
+
+  /**
+   * Creates an instance of the UsernamePasswordCredential with the details
+   * needed to authenticate against Azure Active Directory with a username
+   * and password.
+   *
+   * @param tenantIdOrName The Azure Active Directory tenant (directory) ID or name.
+   * @param clientId The client (application) ID of an App Registration in the tenant.
+   * @param username The user account's e-mail address (user name).
+   * @param password The user account's account password
+   * @param options Options for configuring the client which makes the authentication request.
+   */
+  constructor(
+    tenantIdOrName: string,
+    clientId: string,
+    username: string,
+    password: string,
+    options?: IdentityClientOptions
+  ) {
+    this.identityClient = new IdentityClient(options);
+    this.tenantId = tenantIdOrName;
+    this.clientId = clientId;
+    this.username = username;
+    this.password = password;
+  }
+
+  /**
+   * Authenticates with Azure Active Directory and returns an {@link AccessToken} if
+   * successful.  If authentication cannot be performed at this time, this method may
+   * return null.  If an error occurs during authentication, an {@link AuthenticationError}
+   * containing failure details will be thrown.
+   *
+   * @param scopes The list of scopes for which the token will have access.
+   * @param options The options used to configure any requests this
+   *                TokenCredential implementation might make.
+   */
+  public getToken(
+    scopes: string | string[],
+    options?: GetTokenOptions
+  ): Promise<AccessToken | null> {
+    const webResource = this.identityClient.createWebResource({
+      url: `${this.identityClient.authorityHost}/${this.tenantId}/oauth2/v2.0/token`,
+      method: "POST",
+      disableJsonStringifyOnBody: true,
+      deserializationMapper: undefined,
+      body: qs.stringify({
+        response_type: "token",
+        grant_type: "password",
+        client_id: this.clientId,
+        username: this.username,
+        password: this.password,
+        scope: typeof scopes === "string" ? scopes : scopes.join(" ")
+      }),
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      abortSignal: options && options.abortSignal
+    });
+
+    return this.identityClient.sendTokenRequest(webResource);
+  }
+}
diff --git a/sdk/identity/identity/src/index.ts b/sdk/identity/identity/src/index.ts
index c83481de93fb..5ae8bb91e6de 100644
--- a/sdk/identity/identity/src/index.ts
+++ b/sdk/identity/identity/src/index.ts
@@ -11,6 +11,7 @@ export { ClientSecretCredential } from "./credentials/clientSecretCredential";
 export { ClientCertificateCredential } from "./credentials/clientCertificateCredential";
 export { ManagedIdentityCredential } from "./credentials/managedIdentityCredential";
 export { DefaultAzureCredential } from "./credentials/defaultAzureCredential";
+export { UsernamePasswordCredential } from "./credentials/usernamePasswordCredential";
 export { AuthenticationError, AggregateAuthenticationError } from "./client/errors";
 
 export { TokenCredential, GetTokenOptions, AccessToken } from "@azure/core-http";
diff --git a/sdk/identity/identity/test/identityClient.spec.ts b/sdk/identity/identity/test/identityClient.spec.ts
index 3188cff742b5..bb46cf83c974 100644
--- a/sdk/identity/identity/test/identityClient.spec.ts
+++ b/sdk/identity/identity/test/identityClient.spec.ts
@@ -5,6 +5,7 @@ import assert from "assert";
 import { assertRejects } from "./authTestUtils";
 import { MockAuthHttpClient } from "./authTestUtils";
 import { AuthenticationError } from "../src/";
+import { IdentityClient } from "../src/client/identityClient";
 import { ClientSecretCredential } from "../src";
 
 function isExpectedError(expectedErrorName: string): (error: any) => boolean {
@@ -35,6 +36,17 @@ describe("IdentityClient", function () {
     );
   });
 
+  it("throws an exception when an authorityHost using 'http' is provided", async () => {
+    assert.throws(
+      () => { new IdentityClient({ authorityHost: "http://totallyinsecure.lol" }) },
+      Error,
+      "The authorityHost address must use the 'https' protocol.");
+    assert.throws(
+      () => { new IdentityClient({ authorityHost: "httpsomg.com" }) },
+      Error,
+      "The authorityHost address must use the 'https' protocol.");
+  });
+
   it("returns a usable error when the authentication response doesn't contain a body", async () => {
     const mockHttp = new MockAuthHttpClient({
       authResponse: {
diff --git a/sdk/identity/identity/test/usernamePasswordCredential.spec.ts b/sdk/identity/identity/test/usernamePasswordCredential.spec.ts
new file mode 100644
index 000000000000..18b62a3470ac
--- /dev/null
+++ b/sdk/identity/identity/test/usernamePasswordCredential.spec.ts
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import assert from "assert";
+import { UsernamePasswordCredential } from "../src";
+import { MockAuthHttpClient } from "./authTestUtils";
+
+describe("UsernamePasswordCredential", function () {
+  it("sends an authorization request with the given username and password", async () => {
+    const mockHttpClient = new MockAuthHttpClient();
+
+    const credential = new UsernamePasswordCredential(
+      "tenant",
+      "client",
+      "user@domain.com",
+      "p4s$w0rd",
+      mockHttpClient.identityClientOptions
+    );
+
+    await credential.getToken("scope");
+
+    const authRequest = await mockHttpClient.getAuthRequest();
+    if (!authRequest) {
+      assert.fail("No authentication request was intercepted");
+    } else {
+      assert.strictEqual(
+        authRequest.url.startsWith(`https://authority/tenant`),
+        true,
+        "Request body doesn't contain expected tenantId"
+      );
+      assert.strictEqual(
+        authRequest.body.indexOf(`client_id=client`) > -1,
+        true,
+        "Request body doesn't contain expected clientId"
+      );
+      assert.strictEqual(
+        authRequest.body.indexOf(`username=user%40domain.com`) > -1,
+        true,
+        "Request body doesn't contain expected username"
+      );
+      assert.strictEqual(
+        authRequest.body.indexOf(`password=p4s%24w0rd`) > -1,
+        true,
+        "Request body doesn't contain expected username"
+      );
+    }
+  });
+});

From fd1d6011b4b16d3aee1386c0beddfab60bc23d93 Mon Sep 17 00:00:00 2001
From: Harsha Nalluru <sanallur@microsoft.com>
Date: Tue, 30 Jul 2019 11:47:05 -0700
Subject: [PATCH 13/24] Update Contributing.md - "rush add" command with
 --caret flag (#4512)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c370c82b771..90c79ee45c39 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -168,7 +168,7 @@ Generally speaking, the following commands are roughly equivalent:
 | NPM command                          | Rush command                         | Rush command effect                                              |
 | ------------------------------------ | ------------------------------------ | ---------------------------------------------------------------- |
 | `npm install`                        | `rush update`                        | Install dependencies for all projects in the Rush workspace      |
-| `npm install --save[-dev] <package>` | `rush add -p <package> [--dev]`      | Add or update a dependency in the current project                |
+| `npm install --save[-dev] <package>` | `rush add -p <package> --caret [--dev]`      | Add or update a dependency in the current project                |
 | `npm build`                          | `rush [re]build`                     | Build all projects in the Rush workspace                         |
 |                                      | `rush [re]build -t <package>`        | Build named project and any projects it depends on               |
 |                                      | `rushx build`                        | Build the current project only                                   |

From 39a30e8a0338fc50a06c970a98bd4671d7992b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Rodr=C3=ADguez?=
 <sadasant@users.noreply.github.com>
Date: Tue, 30 Jul 2019 15:46:07 -0400
Subject: [PATCH 14/24] [KeyVault] dotenv fix (#4533)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With this change, we can have a `.env` file in `sdk/keyvault` (the parent
folder, as well as with other of our projects using dotenv) with the
following properties:

```
AZURE_CLIENT_ID=XXXXXXXX
AZURE_CLIENT_SECRET=XXXXXXXX
AZURE_TENANT_ID=XXXXXXXX
KEYVAULT_NAME=XXXXXXXX
TEST_MODE=["record" or "playback", without quotes]
```

And then run `rushx integration-test:node` to record (or playback) all
the tests with the Node environment, and also `rushx integration-test:browser`
to run the tests with the browser environment.

Would this help with #4389 ?

Please review 💙
---
 sdk/keyvault/keyvault-keys/tests/utils/recorder.ts    | 2 +-
 sdk/keyvault/keyvault-secrets/tests/utils/recorder.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/keyvault/keyvault-keys/tests/utils/recorder.ts b/sdk/keyvault/keyvault-keys/tests/utils/recorder.ts
index f2f22b5d58e0..6a86badc44c1 100644
--- a/sdk/keyvault/keyvault-keys/tests/utils/recorder.ts
+++ b/sdk/keyvault/keyvault-keys/tests/utils/recorder.ts
@@ -7,7 +7,7 @@ import { retry as realRetry } from "./retry";
 import { isNode as coreIsNode, delay as coreDelay } from "@azure/core-http";
 import queryString from "query-string";
 import * as dotenv from "dotenv";
-dotenv.config({ path: "../../.env" });
+dotenv.config({ path: "../.env" });
 
 export function isBrowser(): boolean {
   return typeof window !== "undefined";
diff --git a/sdk/keyvault/keyvault-secrets/tests/utils/recorder.ts b/sdk/keyvault/keyvault-secrets/tests/utils/recorder.ts
index f60217fc2a9c..087c0646ad38 100644
--- a/sdk/keyvault/keyvault-secrets/tests/utils/recorder.ts
+++ b/sdk/keyvault/keyvault-secrets/tests/utils/recorder.ts
@@ -8,7 +8,7 @@ import { retry as realRetry } from "./retry";
 import { isNode as coreIsNode } from "@azure/core-http";
 import queryString from "query-string";
 import * as dotenv from "dotenv";
-dotenv.config({ path: "../../.env" });
+dotenv.config({ path: "../.env" });
 
 export function isBrowser(): boolean {
   return typeof window !== "undefined";

From 36593c8ee5f6e82829c895da95cc6c3589faaca9 Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2019 19:51:56 +0000
Subject: [PATCH 15/24] Generated from a1aebd4272669a0c93c4fd1043c331c66fdab651
 (#4433)

fix: apimanagment model validation

- Add missing "body" in response
Didn't add "body" for some "202" with no schemas, but maybe they should be empty.

From 9011944b979f1ab8b6c1dbebe608f8d616ce5bc7 Mon Sep 17 00:00:00 2001
From: ramya0820 <45977823+ramya0820@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:27:01 -0700
Subject: [PATCH 16/24] [Event Hubs] Update RetryOptions interface to pass
 exponential retry params (#4400)

---
 sdk/core/core-amqp/src/retry.ts               |  3 +
 .../event-hubs/review/event-hubs.api.md       |  4 ++
 sdk/eventhub/event-hubs/src/eventHubClient.ts | 27 ++++----
 sdk/eventhub/event-hubs/src/eventHubSender.ts | 66 +++++++++----------
 .../event-hubs/src/managementClient.ts        | 18 ++---
 sdk/eventhub/event-hubs/src/receiver.ts       | 36 ++++------
 6 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/sdk/core/core-amqp/src/retry.ts b/sdk/core/core-amqp/src/retry.ts
index adec1cb2bd34..1662245ed7d3 100644
--- a/sdk/core/core-amqp/src/retry.ts
+++ b/sdk/core/core-amqp/src/retry.ts
@@ -169,6 +169,9 @@ export async function retry<T>(config: RetryConfig<T>): Promise<T> {
   if (config.minExponentialRetryDelayInMs == undefined || config.minExponentialRetryDelayInMs < 0) {
     config.minExponentialRetryDelayInMs = defaultMinDelayForExponentialRetryInMs;
   }
+  if (config.retryPolicy == undefined) {
+    config.retryPolicy = RetryPolicy.LinearRetryPolicy;
+  }
   let lastError: MessagingError | undefined;
   let result: any;
   let success = false;
diff --git a/sdk/eventhub/event-hubs/review/event-hubs.api.md b/sdk/eventhub/event-hubs/review/event-hubs.api.md
index 0423821806b9..be16758c5156 100644
--- a/sdk/eventhub/event-hubs/review/event-hubs.api.md
+++ b/sdk/eventhub/event-hubs/review/event-hubs.api.md
@@ -15,6 +15,7 @@ import { EventHubConnectionConfig } from '@azure/core-amqp';
 import { MessagingError } from '@azure/core-amqp';
 import { Receiver } from 'rhea-promise';
 import { ReceiverOptions } from 'rhea-promise';
+import { RetryPolicy } from '@azure/core-amqp';
 import { Sender } from 'rhea-promise';
 import { SharedKeyCredential } from '@azure/core-amqp';
 import { TokenCredential } from '@azure/core-amqp';
@@ -210,8 +211,11 @@ export class ReceiveHandler {
 
 // @public
 export interface RetryOptions {
+    maxExponentialRetryDelayInMs?: number;
     maxRetries?: number;
+    minExponentialRetryDelayInMs?: number;
     retryInterval?: number;
+    retryPolicy?: RetryPolicy;
     timeoutInMs?: number;
 }
 
diff --git a/sdk/eventhub/event-hubs/src/eventHubClient.ts b/sdk/eventhub/event-hubs/src/eventHubClient.ts
index 8eef02f7087b..36003e442ae1 100644
--- a/sdk/eventhub/event-hubs/src/eventHubClient.ts
+++ b/sdk/eventhub/event-hubs/src/eventHubClient.ts
@@ -10,7 +10,8 @@ import {
   SharedKeyCredential,
   ConnectionConfig,
   isTokenCredential,
-  Constants
+  Constants,
+  RetryPolicy
 } from "@azure/core-amqp";
 
 import { ConnectionContext } from "./connectionContext";
@@ -40,16 +41,20 @@ export interface RetryOptions {
    * A minimum value of 60 seconds will be used if a value not greater than this is provided.
    */
   timeoutInMs?: number;
-  // /**
-  //  * The maximum value the `retryInterval` gets incremented exponentially between retries.
-  //  * Not applicable, when `isExponential` is set to `false`.
-  //  */
-  // maxRetryInterval?: number;
-  // /**
-  //  * Boolean denoting if the `retryInterval` should be incremented exponentially between
-  //  * retries or kept the same.
-  //  */
-  // isExponential?: boolean;
+  /**
+   * @property {RetryPolicy} [retryPolicy] Denotes which retry policy to apply. If undefined, defaults to `LinearRetryPolicy`
+   */
+  retryPolicy?: RetryPolicy;
+  /**
+   * @property {number} [maxExponentialRetryDelayInMs] Denotes the maximum delay between retries
+   * that the retry attempts will be capped at. Applicable only when performing exponential retry.
+   */
+  maxExponentialRetryDelayInMs?: number;
+  /**
+   * @property {number} [minExponentialRetryDelayInMs] Denotes the minimum delay between retries
+   * to use. Applicable only when performing exponential retry.
+   */
+  minExponentialRetryDelayInMs?: number;
 }
 
 export function getRetryAttemptTimeoutInMs(retryOptions: RetryOptions | undefined): number {
diff --git a/sdk/eventhub/event-hubs/src/eventHubSender.ts b/sdk/eventhub/event-hubs/src/eventHubSender.ts
index 5b24d7a54fa0..480fec5fe9c5 100644
--- a/sdk/eventhub/event-hubs/src/eventHubSender.ts
+++ b/sdk/eventhub/event-hubs/src/eventHubSender.ts
@@ -26,10 +26,14 @@ import {
 import { EventData, toAmqpMessage } from "./eventData";
 import { ConnectionContext } from "./connectionContext";
 import { LinkEntity } from "./linkEntity";
-import { SendOptions, EventHubProducerOptions } from "./eventHubClient";
+import {
+  SendOptions,
+  EventHubProducerOptions,
+  getRetryAttemptTimeoutInMs,
+  RetryOptions
+} from "./eventHubClient";
 import { AbortSignalLike, AbortError } from "@azure/abort-controller";
 import { EventDataBatch } from "./eventDataBatch";
-import { getRetryAttemptTimeoutInMs, RetryOptions } from "./eventHubClient";
 
 /**
  * @ignore
@@ -347,12 +351,14 @@ export class EventHubSender extends LinkEntity {
    * @returns Promise<number>
    * @throws {AbortError} Thrown if the operation is cancelled via the abortSignal.
    */
-  async getMaxMessageSize(options?: {
-    retryOptions?: RetryOptions;
-    abortSignal?: AbortSignalLike;
-  }): Promise<number> {
-    const abortSignal = options && options.abortSignal;
-    const retryOptions = options && options.retryOptions;
+  async getMaxMessageSize(
+    options: {
+      retryOptions?: RetryOptions;
+      abortSignal?: AbortSignalLike;
+    } = {}
+  ): Promise<number> {
+    const abortSignal = options.abortSignal;
+    const retryOptions = options.retryOptions || {};
     if (this.isOpen()) {
       return this._sender!.maxMessageSize;
     }
@@ -386,23 +392,18 @@ export class EventHubSender extends LinkEntity {
           this.senderLock
         );
         await defaultLock.acquire(this.senderLock, () => {
-          const maxRetries =
-            retryOptions && typeof retryOptions.maxRetries === "number"
-              ? retryOptions.maxRetries
-              : Constants.defaultMaxRetries;
-          const retryInterval =
-            retryOptions &&
-            typeof retryOptions.retryInterval === "number" &&
-            retryOptions.retryInterval > 0
-              ? retryOptions.retryInterval / 1000
-              : Constants.defaultDelayBetweenOperationRetriesInSeconds;
-
           const config: RetryConfig<void> = {
             operation: () => this._init(),
             connectionId: this._context.connectionId,
             operationType: RetryOperationType.senderLink,
-            maxRetries: maxRetries,
-            delayInSeconds: retryInterval
+            maxRetries: retryOptions.maxRetries,
+            delayInSeconds:
+              typeof retryOptions.retryInterval === "number"
+                ? retryOptions.retryInterval / 1000
+                : undefined,
+            retryPolicy: retryOptions.retryPolicy,
+            minExponentialRetryDelayInMs: retryOptions.minExponentialRetryDelayInMs,
+            maxExponentialRetryDelayInMs: retryOptions.maxExponentialRetryDelayInMs
           };
 
           return retry<void>(config);
@@ -555,6 +556,7 @@ export class EventHubSender extends LinkEntity {
     options: SendOptions & EventHubProducerOptions = {}
   ): Promise<void> {
     const abortSignal: AbortSignalLike | undefined = options.abortSignal;
+    const retryOptions = options.retryOptions || {};
     const sendEventPromise = () =>
       new Promise<void>(async (resolve, reject) => {
         let waitTimer: any;
@@ -567,9 +569,8 @@ export class EventHubSender extends LinkEntity {
 
         const rejectOnAbort = () => {
           const desc: string =
-            `[${this._context.connectionId}] The send operation on the Sender "${
-              this.name
-            }" with ` + `address "${this.address}" has been cancelled by the user.`;
+            `[${this._context.connectionId}] The send operation on the Sender "${this.name}" with ` +
+            `address "${this.address}" has been cancelled by the user.`;
           log.error(desc);
           return reject(new AbortError("The send operation has been cancelled by the user."));
         };
@@ -742,19 +743,18 @@ export class EventHubSender extends LinkEntity {
         }
       });
 
-    const maxRetries = options.retryOptions && options.retryOptions.maxRetries;
-    const delayInSeconds =
-      options.retryOptions &&
-      options.retryOptions.retryInterval &&
-      options.retryOptions.retryInterval >= 0
-        ? options.retryOptions.retryInterval / 1000
-        : Constants.defaultDelayBetweenOperationRetriesInSeconds;
     const config: RetryConfig<void> = {
       operation: sendEventPromise,
       connectionId: this._context.connectionId,
       operationType: RetryOperationType.sendMessage,
-      maxRetries: maxRetries,
-      delayInSeconds: delayInSeconds
+      maxRetries: retryOptions.maxRetries,
+      delayInSeconds:
+        typeof retryOptions.retryInterval === "number"
+          ? retryOptions.retryInterval / 1000
+          : undefined,
+      retryPolicy: retryOptions.retryPolicy,
+      minExponentialRetryDelayInMs: retryOptions.minExponentialRetryDelayInMs,
+      maxExponentialRetryDelayInMs: retryOptions.maxExponentialRetryDelayInMs
     };
     return retry<void>(config);
   }
diff --git a/sdk/eventhub/event-hubs/src/managementClient.ts b/sdk/eventhub/event-hubs/src/managementClient.ts
index 66cae060d583..f8fb25aa8ca5 100644
--- a/sdk/eventhub/event-hubs/src/managementClient.ts
+++ b/sdk/eventhub/event-hubs/src/managementClient.ts
@@ -313,6 +313,7 @@ export class ManagementClient extends LinkEntity {
       requestName?: string;
     } = {}
   ): Promise<any> {
+    const retryOptions = options.retryOptions || {};
     try {
       const aborter: AbortSignalLike | undefined = options && options.abortSignal;
 
@@ -411,19 +412,18 @@ export class ManagementClient extends LinkEntity {
           }
         });
 
-      const maxRetries = options.retryOptions && options.retryOptions.maxRetries;
-      const delayInSeconds =
-        options.retryOptions &&
-        options.retryOptions.retryInterval &&
-        options.retryOptions.retryInterval >= 0
-          ? options.retryOptions.retryInterval / 1000
-          : Constants.defaultDelayBetweenOperationRetriesInSeconds;
       const config: RetryConfig<Message> = {
         operation: sendOperationPromise,
         connectionId: this._context.connectionId,
         operationType: RetryOperationType.management,
-        maxRetries: maxRetries,
-        delayInSeconds: delayInSeconds
+        maxRetries: retryOptions.maxRetries,
+        delayInSeconds:
+          typeof retryOptions.retryInterval === "number"
+            ? retryOptions.retryInterval / 1000
+            : undefined,
+        retryPolicy: retryOptions.retryPolicy,
+        minExponentialRetryDelayInMs: retryOptions.minExponentialRetryDelayInMs,
+        maxExponentialRetryDelayInMs: retryOptions.maxExponentialRetryDelayInMs
       };
       return (await retry<Message>(config)).body;
     } catch (err) {
diff --git a/sdk/eventhub/event-hubs/src/receiver.ts b/sdk/eventhub/event-hubs/src/receiver.ts
index 89ee9e6bbadb..c069e4115eff 100644
--- a/sdk/eventhub/event-hubs/src/receiver.ts
+++ b/sdk/eventhub/event-hubs/src/receiver.ts
@@ -73,7 +73,7 @@ export class EventHubConsumer {
   /**
    * @property The set of retry options to configure the receiveBatch operation.
    */
-  private _retryOptions: Required<Pick<RetryOptions, "maxRetries" | "retryInterval">>;
+  private _retryOptions: RetryOptions;
 
   /**
    * @property Returns `true` if the consumer is closed. This can happen either because the consumer
@@ -112,7 +112,7 @@ export class EventHubConsumer {
    * @readonly
    */
   get ownerLevel(): number | undefined {
-    return this._receiverOptions && this._receiverOptions.ownerLevel;
+    return this._receiverOptions.ownerLevel;
   }
 
   /**
@@ -139,7 +139,7 @@ export class EventHubConsumer {
     this._consumerGroup = consumerGroup;
     this._partitionId = partitionId;
     this._receiverOptions = options || {};
-    this._retryOptions = this._initRetryOptions(this._receiverOptions.retryOptions);
+    this._retryOptions = this._receiverOptions.retryOptions || {};
     this._baseConsumer = new EventHubReceiver(
       context,
       consumerGroup,
@@ -370,7 +370,7 @@ export class EventHubConsumer {
         );
 
         const addTimeout = (): void => {
-          let msg = "[%s] Setting the wait timer for %d seconds for receiver '%s'.";
+          const msg = "[%s] Setting the wait timer for %d seconds for receiver '%s'.";
           log.batching(
             msg,
             this._context.connectionId,
@@ -404,10 +404,16 @@ export class EventHubConsumer {
     const config: RetryConfig<ReceivedEventData[]> = {
       connectionHost: this._context.config.host,
       connectionId: this._context.connectionId,
-      delayInSeconds: retryOptions.retryInterval,
+      delayInSeconds:
+        typeof retryOptions.retryInterval === "number" && retryOptions.retryInterval > 0
+          ? retryOptions.retryInterval / 1000
+          : Constants.defaultDelayBetweenOperationRetriesInSeconds,
       operation: retrieveEvents,
       operationType: RetryOperationType.receiveMessage,
-      maxRetries: retryOptions.maxRetries
+      maxRetries: retryOptions.maxRetries,
+      retryPolicy: retryOptions.retryPolicy,
+      minExponentialRetryDelayInMs: retryOptions.minExponentialRetryDelayInMs,
+      maxExponentialRetryDelayInMs: retryOptions.maxExponentialRetryDelayInMs
     };
     return retry<ReceivedEventData[]>(config);
   }
@@ -436,24 +442,6 @@ export class EventHubConsumer {
     }
   }
 
-  private _initRetryOptions(
-    retryOptions: RetryOptions = {}
-  ): Required<Pick<RetryOptions, "maxRetries" | "retryInterval">> {
-    const maxRetries =
-      typeof retryOptions.maxRetries === "number"
-        ? retryOptions.maxRetries
-        : Constants.defaultMaxRetries;
-    const retryInterval =
-      typeof retryOptions.retryInterval === "number" && retryOptions.retryInterval > 0
-        ? retryOptions.retryInterval / 1000
-        : Constants.defaultDelayBetweenOperationRetriesInSeconds;
-
-    return {
-      maxRetries,
-      retryInterval
-    };
-  }
-
   private _throwIfAlreadyReceiving(): void {
     if (this.isReceivingMessages) {
       const errorMessage = `The EventHubConsumer for "${this._context.config.entityPath}" is already receiving messages.`;

From 0cc6d91cfe9518e2496f69cf7d1e1c219b783900 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Tue, 30 Jul 2019 14:06:23 -0700
Subject: [PATCH 17/24] Update dependency tough-cookie to latest (#4532)

---
 common/config/rush/pnpm-lock.yaml | 11 ++++++-----
 sdk/core/core-http/package.json   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index da77b9169ea8..86095f6b7a2e 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -167,7 +167,7 @@ dependencies:
   source-map-support: 0.5.12
   stream-browserify: 2.0.2
   stream-http: 2.8.3
-  tough-cookie: 2.5.0
+  tough-cookie: 3.0.1
   ts-loader: 5.4.5_typescript@3.5.3
   ts-mocha: 6.0.0_mocha@5.2.0
   ts-node: 7.0.1
@@ -9928,7 +9928,7 @@ packages:
       semver: 5.7.0
       shx: 0.3.2
       sinon: 7.3.2
-      tough-cookie: 2.5.0
+      tough-cookie: 3.0.1
       ts-loader: 5.4.5_typescript@3.5.3
       ts-node: 7.0.1
       tslib: 1.10.0
@@ -9945,7 +9945,7 @@ packages:
     dev: false
     name: '@rush-temp/core-http'
     resolution:
-      integrity: sha512-ykXa+d0rGhwA3mG9JPPf+iKky71Qa2LjflLenGtR78FMTgcDkvq6QmGJ793uZUN5SKu5iXk0CMGYPrngzfx31g==
+      integrity: sha512-o67Dl6unY+yE89CfrBceA7pVYmDlwwZh0qudQtl7Y0mA+25cQkrFZMefKackxDt5Joa9VMafy7Pwp1K0KxPOUA==
       tarball: 'file:projects/core-http.tgz'
     version: 0.0.0
   'file:projects/core-paging.tgz':
@@ -10728,6 +10728,7 @@ packages:
       integrity: sha512-rdhMvXi7mvg+wP0vVdqhouZr17v9a3n4KDMSyuUPU9qhOvY6bMfqoeIXrzgWkCXtR9yjL15gwJHKWsBlByGE4A==
       tarball: 'file:projects/testhub.tgz'
     version: 0.0.0
+registry: ''
 specifiers:
   '@azure/abort-controller': 1.0.0-preview.1
   '@azure/amqp-common': 1.0.0-preview.6
@@ -10784,7 +10785,7 @@ specifiers:
   '@types/semaphore': ^1.1.0
   '@types/semver': ^5.5.0
   '@types/sinon': ^5.0.5
-  '@types/tough-cookie': ^2.3.3
+  '@types/tough-cookie': ^2.3.5
   '@types/tunnel': ^0.0.0
   '@types/underscore': ^1.8.8
   '@types/uuid': ^3.4.3
@@ -10897,7 +10898,7 @@ specifiers:
   source-map-support: ^0.5.9
   stream-browserify: ^2.0.2
   stream-http: ^2.8.3
-  tough-cookie: ^2.4.3
+  tough-cookie: ^3.0.1
   ts-loader: ^5.3.1
   ts-mocha: ^6.0.0
   ts-node: ^7.0.1
diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json
index 1c41cc4012e2..a6a3ca33d915 100644
--- a/sdk/core/core-http/package.json
+++ b/sdk/core/core-http/package.json
@@ -115,7 +115,7 @@
     "axios": "^0.19.0",
     "form-data": "^2.5.0",
     "process": "^0.11.10",
-    "tough-cookie": "^2.4.3",
+    "tough-cookie": "^3.0.1",
     "tslib": "^1.9.3",
     "tunnel": "0.0.6",
     "uuid": "^3.3.2",
@@ -131,7 +131,7 @@
     "@types/node": "^8.0.0",
     "@types/semver": "^5.5.0",
     "@types/sinon": "^5.0.5",
-    "@types/tough-cookie": "^2.3.3",
+    "@types/tough-cookie": "^2.3.5",
     "@types/uuid": "^3.4.3",
     "@types/webpack": "^4.4.13",
     "@types/webpack-dev-middleware": "^2.0.2",

From 3447e8918a023390833122d20ee5260d7eb713f6 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Tue, 30 Jul 2019 14:30:18 -0700
Subject: [PATCH 18/24] Update dev dependency ts-loader to latest (#4536)

- Remove unused dependency from core-arm
---
 common/config/rush/pnpm-lock.yaml | 34 ++++++++++++++++++++++++++-----
 sdk/core/core-arm/package.json    |  1 -
 sdk/core/core-http/package.json   |  2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 86095f6b7a2e..d35e73bc73e0 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -168,7 +168,7 @@ dependencies:
   stream-browserify: 2.0.2
   stream-http: 2.8.3
   tough-cookie: 3.0.1
-  ts-loader: 5.4.5_typescript@3.5.3
+  ts-loader: 6.0.4_typescript@3.5.3
   ts-mocha: 6.0.0_mocha@5.2.0
   ts-node: 7.0.1
   tslib: 1.10.0
@@ -6047,6 +6047,15 @@ packages:
       node: '>=0.10.0'
     resolution:
       integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  /micromatch/4.0.2:
+    dependencies:
+      braces: 3.0.2
+      picomatch: 2.0.7
+    dev: false
+    engines:
+      node: '>=8'
+    resolution:
+      integrity: sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
   /miller-rabin/4.0.1:
     dependencies:
       bn.js: 4.11.8
@@ -8871,6 +8880,21 @@ packages:
       typescript: '*'
     resolution:
       integrity: sha512-XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw==
+  /ts-loader/6.0.4_typescript@3.5.3:
+    dependencies:
+      chalk: 2.4.2
+      enhanced-resolve: 4.1.0
+      loader-utils: 1.2.3
+      micromatch: 4.0.2
+      semver: 6.3.0
+      typescript: 3.5.3
+    dev: false
+    engines:
+      node: '>=8.6'
+    peerDependencies:
+      typescript: '*'
+    resolution:
+      integrity: sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g==
   /ts-mocha/6.0.0_mocha@5.2.0:
     dependencies:
       mocha: 5.2.0
@@ -9804,7 +9828,7 @@ packages:
     dev: false
     name: '@rush-temp/core-arm'
     resolution:
-      integrity: sha512-1sOGfOod5UwbFF8cs0IekpFq9Zne5DIWp+lpG7Isjn7/io2udgugy3ciY7e2XcikZk34wctC8zHQiPul6G9nhg==
+      integrity: sha512-h+mpJ/FL0Zt3ea/pGEwnk+ZaqwoeXh9W2tWOPMnjCSzrH7GSHnbaLl/dU+svMeag5MdoeBmiUppFdBWPtuu9eQ==
       tarball: 'file:projects/core-arm.tgz'
     version: 0.0.0
   'file:projects/core-asynciterator-polyfill.tgz':
@@ -9929,7 +9953,7 @@ packages:
       shx: 0.3.2
       sinon: 7.3.2
       tough-cookie: 3.0.1
-      ts-loader: 5.4.5_typescript@3.5.3
+      ts-loader: 6.0.4_typescript@3.5.3
       ts-node: 7.0.1
       tslib: 1.10.0
       tunnel: 0.0.6
@@ -9945,7 +9969,7 @@ packages:
     dev: false
     name: '@rush-temp/core-http'
     resolution:
-      integrity: sha512-o67Dl6unY+yE89CfrBceA7pVYmDlwwZh0qudQtl7Y0mA+25cQkrFZMefKackxDt5Joa9VMafy7Pwp1K0KxPOUA==
+      integrity: sha512-7Vrm9Hbt+zQPP66qqOnGdqBP1HqkN60pb8EHIdwMhD6DYYFmx41vCT3v0Jlkp1Vz0k999yCsGzXEfxwU1hxyUQ==
       tarball: 'file:projects/core-http.tgz'
     version: 0.0.0
   'file:projects/core-paging.tgz':
@@ -10899,7 +10923,7 @@ specifiers:
   stream-browserify: ^2.0.2
   stream-http: ^2.8.3
   tough-cookie: ^3.0.1
-  ts-loader: ^5.3.1
+  ts-loader: ^6.0.4
   ts-mocha: ^6.0.0
   ts-node: ^7.0.1
   tslib: ^1.9.3
diff --git a/sdk/core/core-arm/package.json b/sdk/core/core-arm/package.json
index 819cb1a7c7ec..5a25a4660c4b 100644
--- a/sdk/core/core-arm/package.json
+++ b/sdk/core/core-arm/package.json
@@ -69,7 +69,6 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rollup-plugin-visualizer": "^2.0.0",
     "shx": "^0.3.2",
-    "ts-loader": "^5.3.1",
     "ts-node": "^7.0.1",
     "typescript": "^3.2.2",
     "uglify-js": "^3.4.9",
diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json
index a6a3ca33d915..ce5bc7ae01ae 100644
--- a/sdk/core/core-http/package.json
+++ b/sdk/core/core-http/package.json
@@ -177,7 +177,7 @@
     "semver": "^5.5.0",
     "shx": "^0.3.2",
     "sinon": "^7.1.0",
-    "ts-loader": "^5.3.1",
+    "ts-loader": "^6.0.4",
     "ts-node": "^7.0.1",
     "typescript": "^3.2.2",
     "uglify-js": "^3.4.9",

From 63164d1f758e36103b3d317eb0bc38dc23c6e2e4 Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:02:57 +0000
Subject: [PATCH 19/24] Generated from 1f1421f9fdbf67ac8c1ac7f540346d3e98eef77e
 (#4431)

remove x-ms-odata
---
 sdk/apimanagement/arm-apimanagement/README.md |  10 +-
 .../arm-apimanagement/package.json            |  10 +-
 .../arm-apimanagement/rollup.config.js        |   8 +-
 .../src/apiManagementClient.ts                |   4 +-
 .../src/apiManagementClientContext.ts         |  12 +-
 .../arm-apimanagement/src/models/index.ts     | 810 ++++++++++--------
 .../arm-apimanagement/src/models/mappers.ts   | 588 ++++++-------
 .../src/models/parameters.ts                  | 144 ++--
 .../arm-apimanagement/src/operations/api.ts   |  92 +-
 .../src/operations/apiDiagnostic.ts           |  74 +-
 .../src/operations/apiExport.ts               |  14 +-
 .../src/operations/apiIssue.ts                |  72 +-
 .../src/operations/apiIssueAttachment.ts      |  62 +-
 .../src/operations/apiIssueComment.ts         |  62 +-
 .../src/operations/apiManagementOperations.ts |  24 +-
 .../src/operations/apiManagementService.ts    | 122 +--
 .../operations/apiManagementServiceSkus.ts    |  24 +-
 .../src/operations/apiOperation.ts            |  74 +-
 .../src/operations/apiOperationPolicy.ts      |  52 +-
 .../src/operations/apiPolicy.ts               |  52 +-
 .../src/operations/apiProduct.ts              |  22 +-
 .../src/operations/apiRelease.ts              |  74 +-
 .../src/operations/apiRevision.ts             |  22 +-
 .../src/operations/apiSchema.ts               |  62 +-
 .../src/operations/apiTagDescription.ts       |  62 +-
 .../src/operations/apiVersionSet.ts           |  74 +-
 .../src/operations/authorizationServer.ts     |  74 +-
 .../src/operations/backend.ts                 |  86 +-
 .../arm-apimanagement/src/operations/cache.ts |  74 +-
 .../src/operations/certificate.ts             |  62 +-
 .../src/operations/delegationSettings.ts      |  44 +-
 .../src/operations/diagnostic.ts              |  74 +-
 .../src/operations/emailTemplate.ts           |  74 +-
 .../arm-apimanagement/src/operations/group.ts |  74 +-
 .../src/operations/groupUser.ts               |  54 +-
 .../src/operations/identityProvider.ts        |  76 +-
 .../arm-apimanagement/src/operations/issue.ts |  32 +-
 .../src/operations/logger.ts                  |  74 +-
 .../src/operations/networkStatus.ts           |  24 +-
 .../src/operations/notification.ts            |  40 +-
 .../operations/notificationRecipientEmail.ts  |  46 +-
 .../operations/notificationRecipientUser.ts   |  46 +-
 .../src/operations/openIdConnectProvider.ts   |  74 +-
 .../src/operations/operationOperations.ts     |  22 +-
 .../src/operations/policy.ts                  |  52 +-
 .../src/operations/policySnippet.ts           |  12 +-
 .../src/operations/product.ts                 |  92 +-
 .../src/operations/productApi.ts              |  56 +-
 .../src/operations/productGroup.ts            |  56 +-
 .../src/operations/productPolicy.ts           |  52 +-
 .../src/operations/productSubscriptions.ts    |  22 +-
 .../src/operations/property.ts                |  74 +-
 .../src/operations/quotaByCounterKeys.ts      |  26 +-
 .../src/operations/quotaByPeriodKeys.ts       |  26 +-
 .../src/operations/region.ts                  |  24 +-
 .../src/operations/reports.ts                 | 138 +--
 .../src/operations/signInSettings.ts          |  44 +-
 .../src/operations/signUpSettings.ts          |  44 +-
 .../src/operations/subscription.ts            |  98 +--
 .../arm-apimanagement/src/operations/tag.ts   | 254 +++---
 .../src/operations/tagResource.ts             |  22 +-
 .../src/operations/tenantAccess.ts            |  60 +-
 .../src/operations/tenantAccessGit.ts         |  38 +-
 .../src/operations/tenantConfiguration.ts     |  40 +-
 .../arm-apimanagement/src/operations/user.ts  |  94 +-
 .../operations/userConfirmationPassword.ts    |  16 +-
 .../src/operations/userGroup.ts               |  22 +-
 .../src/operations/userIdentities.ts          |  24 +-
 .../src/operations/userSubscription.ts        |  22 +-
 69 files changed, 2567 insertions(+), 2517 deletions(-)

diff --git a/sdk/apimanagement/arm-apimanagement/README.md b/sdk/apimanagement/arm-apimanagement/README.md
index 862f3d10a47b..7abcc247b997 100644
--- a/sdk/apimanagement/arm-apimanagement/README.md
+++ b/sdk/apimanagement/arm-apimanagement/README.md
@@ -26,8 +26,8 @@ npm install @azure/ms-rest-nodeauth
 ##### Sample code
 
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
 import { ApiManagementClient, ApiManagementModels, ApiManagementMappers } from "@azure/arm-apimanagement";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
@@ -68,8 +68,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 <html lang="en">
   <head>
     <title>@azure/arm-apimanagement sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/@azure/core-http/dist/coreHttp.browser.js"></script>
+    <script src="node_modules/@azure/core-arm/dist/coreArm.js"></script>
     <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/arm-apimanagement/dist/arm-apimanagement.js"></script>
     <script type="text/javascript">
@@ -108,3 +108,5 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 ## Related projects
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/apimanagement/arm-apimanagement/README.png)
diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index 3dc6a1e94b14..b3a26bfc5de1 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -4,8 +4,8 @@
   "description": "ApiManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.8.1",
+    "@azure/core-arm": "^1.0.0-preview.1",
+    "@azure/core-http": "^1.0.0-preview.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -26,13 +26,13 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/apimanagement/arm-apimanagement",
   "repository": {
     "type": "git",
-    "url": "https://github.com/azure/azure-sdk-for-js.git"
+    "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
   "bugs": {
-    "url": "https://github.com/azure/azure-sdk-for-js/issues"
+    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
   },
   "files": [
     "dist/**/*.js",
diff --git a/sdk/apimanagement/arm-apimanagement/rollup.config.js b/sdk/apimanagement/arm-apimanagement/rollup.config.js
index dc0dc5622703..90edb8e8a3ff 100644
--- a/sdk/apimanagement/arm-apimanagement/rollup.config.js
+++ b/sdk/apimanagement/arm-apimanagement/rollup.config.js
@@ -8,8 +8,8 @@ import sourcemaps from "rollup-plugin-sourcemaps";
 const config = {
   input: "./esm/apiManagementClient.js",
   external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
+    "@azure/core-http",
+    "@azure/core-arm"
   ],
   output: {
     file: "./dist/arm-apimanagement.js",
@@ -17,8 +17,8 @@ const config = {
     name: "Azure.ArmApimanagement",
     sourcemap: true,
     globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
+      "@azure/core-http": "coreHttp",
+      "@azure/core-arm": "coreArm"
     },
     banner: `/*
  * Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
index 454cda6b424c..3a64af8ce303 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
@@ -86,7 +86,7 @@ class ApiManagementClient extends ApiManagementClientContext {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     super(credentials, subscriptionId, options);
     this.api = new operations.Api(this);
     this.apiRevision = new operations.ApiRevision(this);
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index 0a2d57d4bcfe..220b849ff8d9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -9,14 +9,14 @@
  */
 
 import * as Models from "./models";
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 
 const packageName = "@azure/arm-apimanagement";
 const packageVersion = "5.1.0";
 
-export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
-  credentials: msRest.ServiceClientCredentials;
+export class ApiManagementClientContext extends coreArm.AzureServiceClient {
+  credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials;
   apiVersion?: string;
   subscriptionId: string;
 
@@ -27,7 +27,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
@@ -39,7 +39,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
       options = {};
     }
     if(!options.userAgent) {
-      const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
+      const defaultUserAgent = coreArm.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index f91afeb3611d..27473a3b8b3e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -6,8 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export { BaseResource, CloudError };
 
@@ -2355,13 +2355,31 @@ export interface ApiManagementServiceBaseProperties {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2505,13 +2523,31 @@ export interface ApiManagementServiceResource extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2639,13 +2675,31 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -4407,7 +4461,7 @@ export interface QuotaCounterValueContract {
 /**
  * Optional Parameters.
  */
-export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4440,7 +4494,7 @@ export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4451,7 +4505,7 @@ export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete all revisions of the Api.
    */
@@ -4461,7 +4515,7 @@ export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase
 /**
  * Optional Parameters.
  */
-export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * | Field       | Supported operators    | Supported functions               |
    * |-------------|------------------------|-----------------------------------|
@@ -4492,7 +4546,7 @@ export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiBeginCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4503,7 +4557,7 @@ export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiRevisionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter |
@@ -4523,7 +4577,7 @@ export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le,
@@ -4543,7 +4597,7 @@ export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4554,7 +4608,7 @@ export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4583,7 +4637,7 @@ export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4594,7 +4648,7 @@ export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4604,7 +4658,7 @@ export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4615,7 +4669,7 @@ export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface TagListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4636,7 +4690,7 @@ export interface TagListByOperationOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4657,7 +4711,7 @@ export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface TagListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4678,7 +4732,7 @@ export interface TagListByProductOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4703,7 +4757,7 @@ export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface TagCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4714,7 +4768,7 @@ export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiProductListByApisOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiProductListByApisOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4734,7 +4788,7 @@ export interface ApiProductListByApisOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4744,7 +4798,7 @@ export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4755,7 +4809,7 @@ export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter |
@@ -4775,7 +4829,7 @@ export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4786,7 +4840,7 @@ export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * If true removes all references to the schema before deleting it.
    */
@@ -4796,7 +4850,7 @@ export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4816,7 +4870,7 @@ export interface ApiDiagnosticListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4827,7 +4881,7 @@ export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4853,7 +4907,7 @@ export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Expand the comment attachments.
    */
@@ -4863,7 +4917,7 @@ export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4874,7 +4928,7 @@ export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4895,7 +4949,7 @@ export interface ApiIssueCommentListByServiceOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4906,7 +4960,7 @@ export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.Requ
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4927,7 +4981,7 @@ export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4938,7 +4992,7 @@ export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4959,7 +5013,7 @@ export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4970,7 +5024,7 @@ export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface OperationListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface OperationListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5000,7 +5054,7 @@ export interface OperationListByTagsOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>
@@ -5019,7 +5073,7 @@ export interface ApiVersionSetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5030,7 +5084,7 @@ export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5051,7 +5105,7 @@ export interface AuthorizationServerListByServiceOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5062,7 +5116,7 @@ export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.
 /**
  * Optional Parameters.
  */
-export interface BackendListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5084,7 +5138,7 @@ export interface BackendListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5095,7 +5149,7 @@ export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendReconnectOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Reconnect request parameters.
    */
@@ -5105,7 +5159,7 @@ export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5119,7 +5173,7 @@ export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5130,7 +5184,7 @@ export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface CertificateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5153,7 +5207,7 @@ export interface CertificateListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5164,7 +5218,7 @@ export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5176,7 +5230,7 @@ export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalPar
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5188,7 +5242,7 @@ export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOption
 /**
  * Optional Parameters.
  */
-export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5208,7 +5262,7 @@ export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5219,7 +5273,7 @@ export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5239,7 +5293,7 @@ export interface EmailTemplateListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5250,7 +5304,7 @@ export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5273,7 +5327,7 @@ export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5284,7 +5338,7 @@ export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupUserListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5309,7 +5363,7 @@ export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface IdentityProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5320,7 +5374,7 @@ export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface IssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5345,7 +5399,7 @@ export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface LoggerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5368,7 +5422,7 @@ export interface LoggerListByServiceOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5379,7 +5433,7 @@ export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Force deletion even if diagnostic is attached.
    */
@@ -5389,7 +5443,7 @@ export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface NotificationListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5403,7 +5457,7 @@ export interface NotificationListByServiceOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface NotificationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5414,7 +5468,7 @@ export interface NotificationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5435,7 +5489,7 @@ export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5446,7 +5500,7 @@ export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRes
 /**
  * Optional Parameters.
  */
-export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5456,7 +5510,7 @@ export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5467,7 +5521,7 @@ export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface PolicySnippetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicySnippetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy scope. Possible values include: 'Tenant', 'Product', 'Api', 'Operation', 'All'
    */
@@ -5477,7 +5531,7 @@ export interface PolicySnippetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignInSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5488,7 +5542,7 @@ export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignUpSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5499,7 +5553,7 @@ export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DelegationSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5510,7 +5564,7 @@ export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ProductListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5543,7 +5597,7 @@ export interface ProductListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5554,7 +5608,7 @@ export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete existing subscriptions associated with the product or not.
    */
@@ -5564,7 +5618,7 @@ export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5592,7 +5646,7 @@ export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ProductApiListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductApiListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5617,7 +5671,7 @@ export interface ProductApiListByProductOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ProductGroupListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductGroupListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5638,7 +5692,7 @@ export interface ProductGroupListByProductOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductSubscriptionsListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5665,7 +5719,7 @@ export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5675,7 +5729,7 @@ export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5686,7 +5740,7 @@ export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface PropertyListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le,
@@ -5707,7 +5761,7 @@ export interface PropertyListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5718,7 +5772,7 @@ export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5736,7 +5790,7 @@ export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByUserOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5754,7 +5808,7 @@ export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5772,7 +5826,7 @@ export interface ReportsListByOperationOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5790,7 +5844,7 @@ export interface ReportsListByProductOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByGeoOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5804,7 +5858,7 @@ export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListBySubscriptionOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5822,7 +5876,7 @@ export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByTimeOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5840,7 +5894,7 @@ export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByRequestOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByRequestOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5854,7 +5908,7 @@ export interface ReportsListByRequestOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5881,7 +5935,7 @@ export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5898,7 +5952,7 @@ export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5910,7 +5964,7 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagResourceListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagResourceListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le,
@@ -5942,7 +5996,7 @@ export interface TagResourceListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface UserListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5972,7 +6026,7 @@ export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface UserCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5983,7 +6037,7 @@ export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface UserDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Whether to delete user's subscription or not.
    */
@@ -5997,7 +6051,7 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserGroupListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -6019,7 +6073,7 @@ export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface UserSubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserSubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -7943,7 +7997,7 @@ export type ApiListByServiceResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -7963,7 +8017,7 @@ export type ApiGetEntityTagResponse = ApiGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -7978,7 +8032,7 @@ export type ApiGetResponse = ApiContract & ApiGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8003,7 +8057,7 @@ export type ApiCreateOrUpdateResponse = ApiContract & ApiCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8028,7 +8082,7 @@ export type ApiListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8048,7 +8102,7 @@ export type ApiListByServiceNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8068,7 +8122,7 @@ export type ApiListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8088,7 +8142,7 @@ export type ApiRevisionListByServiceResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8108,7 +8162,7 @@ export type ApiRevisionListByServiceNextResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8128,7 +8182,7 @@ export type ApiReleaseListByServiceResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8148,7 +8202,7 @@ export type ApiReleaseGetEntityTagResponse = ApiReleaseGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8163,7 +8217,7 @@ export type ApiReleaseGetResponse = ApiReleaseContract & ApiReleaseGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8188,7 +8242,7 @@ export type ApiReleaseCreateOrUpdateResponse = ApiReleaseContract & ApiReleaseCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8213,7 +8267,7 @@ export type ApiReleaseListByServiceNextResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8233,7 +8287,7 @@ export type ApiOperationListByApiResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8253,7 +8307,7 @@ export type ApiOperationGetEntityTagResponse = ApiOperationGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8268,7 +8322,7 @@ export type ApiOperationGetResponse = OperationContract & ApiOperationGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8293,7 +8347,7 @@ export type ApiOperationCreateOrUpdateResponse = OperationContract & ApiOperatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8318,7 +8372,7 @@ export type ApiOperationListByApiNextResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8338,7 +8392,7 @@ export type ApiOperationPolicyListByOperationResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8358,7 +8412,7 @@ export type ApiOperationPolicyGetEntityTagResponse = ApiOperationPolicyGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8373,7 +8427,7 @@ export type ApiOperationPolicyGetResponse = PolicyContract & ApiOperationPolicyG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8398,7 +8452,7 @@ export type ApiOperationPolicyCreateOrUpdateResponse = PolicyContract & ApiOpera
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8423,7 +8477,7 @@ export type TagListByOperationResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8443,7 +8497,7 @@ export type TagGetEntityStateByOperationResponse = TagGetEntityStateByOperationH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8458,7 +8512,7 @@ export type TagGetByOperationResponse = TagContract & TagGetByOperationHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8483,7 +8537,7 @@ export type TagAssignToOperationResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8503,7 +8557,7 @@ export type TagListByApiResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8523,7 +8577,7 @@ export type TagGetEntityStateByApiResponse = TagGetEntityStateByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8538,7 +8592,7 @@ export type TagGetByApiResponse = TagContract & TagGetByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8563,7 +8617,7 @@ export type TagAssignToApiResponse = TagContract & TagAssignToApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8588,7 +8642,7 @@ export type TagListByProductResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8608,7 +8662,7 @@ export type TagGetEntityStateByProductResponse = TagGetEntityStateByProductHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8623,7 +8677,7 @@ export type TagGetByProductResponse = TagContract & TagGetByProductHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8648,7 +8702,7 @@ export type TagAssignToProductResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8668,7 +8722,7 @@ export type TagListByServiceResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8688,7 +8742,7 @@ export type TagGetEntityStateResponse = TagGetEntityStateHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8703,7 +8757,7 @@ export type TagGetResponse = TagContract & TagGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8728,7 +8782,7 @@ export type TagCreateOrUpdateResponse = TagContract & TagCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8753,7 +8807,7 @@ export type TagListByOperationNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8773,7 +8827,7 @@ export type TagListByApiNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8793,7 +8847,7 @@ export type TagListByProductNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8813,7 +8867,7 @@ export type TagListByServiceNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8833,7 +8887,7 @@ export type ApiProductListByApisResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8853,7 +8907,7 @@ export type ApiProductListByApisNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8873,7 +8927,7 @@ export type ApiPolicyListByApiResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8893,7 +8947,7 @@ export type ApiPolicyGetEntityTagResponse = ApiPolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8908,7 +8962,7 @@ export type ApiPolicyGetResponse = PolicyContract & ApiPolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8933,7 +8987,7 @@ export type ApiPolicyCreateOrUpdateResponse = PolicyContract & ApiPolicyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8958,7 +9012,7 @@ export type ApiSchemaListByApiResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8978,7 +9032,7 @@ export type ApiSchemaGetEntityTagResponse = ApiSchemaGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8993,7 +9047,7 @@ export type ApiSchemaGetResponse = SchemaContract & ApiSchemaGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9018,7 +9072,7 @@ export type ApiSchemaCreateOrUpdateResponse = SchemaContract & ApiSchemaCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9043,7 +9097,7 @@ export type ApiSchemaListByApiNextResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9063,7 +9117,7 @@ export type ApiDiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9083,7 +9137,7 @@ export type ApiDiagnosticGetEntityTagResponse = ApiDiagnosticGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9098,7 +9152,7 @@ export type ApiDiagnosticGetResponse = DiagnosticContract & ApiDiagnosticGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9123,7 +9177,7 @@ export type ApiDiagnosticCreateOrUpdateResponse = DiagnosticContract & ApiDiagno
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9148,7 +9202,7 @@ export type ApiDiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9168,7 +9222,7 @@ export type ApiIssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9188,7 +9242,7 @@ export type ApiIssueGetEntityTagResponse = ApiIssueGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9203,7 +9257,7 @@ export type ApiIssueGetResponse = IssueContract & ApiIssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9228,7 +9282,7 @@ export type ApiIssueCreateOrUpdateResponse = IssueContract & ApiIssueCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9253,7 +9307,7 @@ export type ApiIssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9273,7 +9327,7 @@ export type ApiIssueCommentListByServiceResponse = IssueCommentCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9293,7 +9347,7 @@ export type ApiIssueCommentGetEntityTagResponse = ApiIssueCommentGetEntityTagHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9308,7 +9362,7 @@ export type ApiIssueCommentGetResponse = IssueCommentContract & ApiIssueCommentG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9333,7 +9387,7 @@ export type ApiIssueCommentCreateOrUpdateResponse = IssueCommentContract & ApiIs
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9358,7 +9412,7 @@ export type ApiIssueCommentListByServiceNextResponse = IssueCommentCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9378,7 +9432,7 @@ export type ApiIssueAttachmentListByServiceResponse = IssueAttachmentCollection
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9398,7 +9452,7 @@ export type ApiIssueAttachmentGetEntityTagResponse = ApiIssueAttachmentGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9413,7 +9467,7 @@ export type ApiIssueAttachmentGetResponse = IssueAttachmentContract & ApiIssueAt
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9438,7 +9492,7 @@ export type ApiIssueAttachmentCreateOrUpdateResponse = IssueAttachmentContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9463,7 +9517,7 @@ export type ApiIssueAttachmentListByServiceNextResponse = IssueAttachmentCollect
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9483,7 +9537,7 @@ export type ApiTagDescriptionListByServiceResponse = TagDescriptionCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9503,7 +9557,7 @@ export type ApiTagDescriptionGetEntityTagResponse = ApiTagDescriptionGetEntityTa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9518,7 +9572,7 @@ export type ApiTagDescriptionGetResponse = TagDescriptionContract & ApiTagDescri
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9543,7 +9597,7 @@ export type ApiTagDescriptionCreateOrUpdateResponse = TagDescriptionContract & A
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9568,7 +9622,7 @@ export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollectio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9588,7 +9642,7 @@ export type OperationListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9608,7 +9662,7 @@ export type OperationListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9628,7 +9682,7 @@ export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9648,7 +9702,7 @@ export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9663,7 +9717,7 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9688,7 +9742,7 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9713,7 +9767,7 @@ export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9733,7 +9787,7 @@ export type AuthorizationServerListByServiceResponse = AuthorizationServerCollec
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9753,7 +9807,7 @@ export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEnti
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9768,7 +9822,7 @@ export type AuthorizationServerGetResponse = AuthorizationServerContract & Autho
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9793,7 +9847,7 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9818,7 +9872,7 @@ export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9838,7 +9892,7 @@ export type BackendListByServiceResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9858,7 +9912,7 @@ export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9873,7 +9927,7 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9898,7 +9952,7 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9923,7 +9977,7 @@ export type BackendListByServiceNextResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9943,7 +9997,7 @@ export type CacheListByServiceResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9963,7 +10017,7 @@ export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9978,7 +10032,7 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10003,7 +10057,7 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10028,7 +10082,7 @@ export type CacheListByServiceNextResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10048,7 +10102,7 @@ export type CertificateListByServiceResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10068,7 +10122,7 @@ export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10083,7 +10137,7 @@ export type CertificateGetResponse = CertificateContract & CertificateGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10108,7 +10162,7 @@ export type CertificateCreateOrUpdateResponse = CertificateContract & Certificat
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10133,7 +10187,7 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10153,7 +10207,7 @@ export type ApiManagementOperationsListResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10173,7 +10227,7 @@ export type ApiManagementOperationsListNextResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10193,7 +10247,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusResponse = ResourceS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10213,7 +10267,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusNextResponse = Resou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10233,7 +10287,7 @@ export type ApiManagementServiceRestoreResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10253,7 +10307,7 @@ export type ApiManagementServiceBackupResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10273,7 +10327,7 @@ export type ApiManagementServiceCreateOrUpdateResponse = ApiManagementServiceRes
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10293,7 +10347,7 @@ export type ApiManagementServiceUpdateResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10313,7 +10367,7 @@ export type ApiManagementServiceGetResponse = ApiManagementServiceResource & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10333,7 +10387,7 @@ export type ApiManagementServiceDeleteMethodResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10353,7 +10407,7 @@ export type ApiManagementServiceListByResourceGroupResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10373,7 +10427,7 @@ export type ApiManagementServiceListResponse = ApiManagementServiceListResult &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10393,7 +10447,7 @@ export type ApiManagementServiceGetSsoTokenResponse = ApiManagementServiceGetSso
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10413,7 +10467,7 @@ export type ApiManagementServiceCheckNameAvailabilityResponse = ApiManagementSer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10433,7 +10487,7 @@ export type ApiManagementServiceApplyNetworkConfigurationUpdatesResponse = ApiMa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10453,7 +10507,7 @@ export type ApiManagementServiceBeginRestoreResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10473,7 +10527,7 @@ export type ApiManagementServiceBeginBackupResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10493,7 +10547,7 @@ export type ApiManagementServiceBeginCreateOrUpdateResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10513,7 +10567,7 @@ export type ApiManagementServiceBeginUpdateResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10533,7 +10587,7 @@ export type ApiManagementServiceBeginDeleteMethodResponse = ApiManagementService
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10553,7 +10607,7 @@ export type ApiManagementServiceBeginApplyNetworkConfigurationUpdatesResponse =
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10573,7 +10627,7 @@ export type ApiManagementServiceListByResourceGroupNextResponse = ApiManagementS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10593,7 +10647,7 @@ export type ApiManagementServiceListNextResponse = ApiManagementServiceListResul
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10613,7 +10667,7 @@ export type DiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10633,7 +10687,7 @@ export type DiagnosticGetEntityTagResponse = DiagnosticGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10648,7 +10702,7 @@ export type DiagnosticGetResponse = DiagnosticContract & DiagnosticGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10673,7 +10727,7 @@ export type DiagnosticCreateOrUpdateResponse = DiagnosticContract & DiagnosticCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10698,7 +10752,7 @@ export type DiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10718,7 +10772,7 @@ export type EmailTemplateListByServiceResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10738,7 +10792,7 @@ export type EmailTemplateGetEntityTagResponse = EmailTemplateGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10753,7 +10807,7 @@ export type EmailTemplateGetResponse = EmailTemplateContract & EmailTemplateGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10778,7 +10832,7 @@ export type EmailTemplateCreateOrUpdateResponse = EmailTemplateContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10798,7 +10852,7 @@ export type EmailTemplateListByServiceNextResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10818,7 +10872,7 @@ export type GroupListByServiceResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10838,7 +10892,7 @@ export type GroupGetEntityTagResponse = GroupGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10853,7 +10907,7 @@ export type GroupGetResponse = GroupContract & GroupGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10878,7 +10932,7 @@ export type GroupCreateOrUpdateResponse = GroupContract & GroupCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10903,7 +10957,7 @@ export type GroupListByServiceNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10923,7 +10977,7 @@ export type GroupUserListResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10948,7 +11002,7 @@ export type GroupUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10968,7 +11022,7 @@ export type GroupUserCreateResponse = UserContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10988,7 +11042,7 @@ export type GroupUserListNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11008,7 +11062,7 @@ export type IdentityProviderListByServiceResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11028,7 +11082,7 @@ export type IdentityProviderGetEntityTagResponse = IdentityProviderGetEntityTagH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11043,7 +11097,7 @@ export type IdentityProviderGetResponse = IdentityProviderContract & IdentityPro
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11068,7 +11122,7 @@ export type IdentityProviderCreateOrUpdateResponse = IdentityProviderContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11093,7 +11147,7 @@ export type IdentityProviderListByServiceNextResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11113,7 +11167,7 @@ export type IssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11133,7 +11187,7 @@ export type IssueGetResponse = IssueContract & IssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11158,7 +11212,7 @@ export type IssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11178,7 +11232,7 @@ export type LoggerListByServiceResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11198,7 +11252,7 @@ export type LoggerGetEntityTagResponse = LoggerGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11213,7 +11267,7 @@ export type LoggerGetResponse = LoggerContract & LoggerGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11238,7 +11292,7 @@ export type LoggerCreateOrUpdateResponse = LoggerContract & LoggerCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11263,7 +11317,7 @@ export type LoggerListByServiceNextResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11283,7 +11337,7 @@ export type NetworkStatusListByServiceResponse = Array<NetworkStatusContractByLo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11303,7 +11357,7 @@ export type NetworkStatusListByLocationResponse = NetworkStatusContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11323,7 +11377,7 @@ export type NotificationListByServiceResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11343,7 +11397,7 @@ export type NotificationGetResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11363,7 +11417,7 @@ export type NotificationCreateOrUpdateResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11383,7 +11437,7 @@ export type NotificationListByServiceNextResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11403,7 +11457,7 @@ export type NotificationRecipientUserListByNotificationResponse = RecipientUserC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11428,7 +11482,7 @@ export type NotificationRecipientUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11448,7 +11502,7 @@ export type NotificationRecipientUserCreateOrUpdateResponse = RecipientUserContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11468,7 +11522,7 @@ export type NotificationRecipientEmailListByNotificationResponse = RecipientEmai
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11493,7 +11547,7 @@ export type NotificationRecipientEmailCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11513,7 +11567,7 @@ export type NotificationRecipientEmailCreateOrUpdateResponse = RecipientEmailCon
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11533,7 +11587,7 @@ export type OpenIdConnectProviderListByServiceResponse = OpenIdConnectProviderCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11553,7 +11607,7 @@ export type OpenIdConnectProviderGetEntityTagResponse = OpenIdConnectProviderGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11568,7 +11622,7 @@ export type OpenIdConnectProviderGetResponse = OpenidConnectProviderContract & O
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11593,7 +11647,7 @@ export type OpenIdConnectProviderCreateOrUpdateResponse = OpenidConnectProviderC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11618,7 +11672,7 @@ export type OpenIdConnectProviderListByServiceNextResponse = OpenIdConnectProvid
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11638,7 +11692,7 @@ export type PolicyListByServiceResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11658,7 +11712,7 @@ export type PolicyGetEntityTagResponse = PolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11673,7 +11727,7 @@ export type PolicyGetResponse = PolicyContract & PolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11698,7 +11752,7 @@ export type PolicyCreateOrUpdateResponse = PolicyContract & PolicyCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11723,7 +11777,7 @@ export type PolicySnippetListByServiceResponse = PolicySnippetsCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11743,7 +11797,7 @@ export type SignInSettingsGetEntityTagResponse = SignInSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11758,7 +11812,7 @@ export type SignInSettingsGetResponse = PortalSigninSettings & SignInSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11783,7 +11837,7 @@ export type SignInSettingsCreateOrUpdateResponse = PortalSigninSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11803,7 +11857,7 @@ export type SignUpSettingsGetEntityTagResponse = SignUpSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11818,7 +11872,7 @@ export type SignUpSettingsGetResponse = PortalSignupSettings & SignUpSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11843,7 +11897,7 @@ export type SignUpSettingsCreateOrUpdateResponse = PortalSignupSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11863,7 +11917,7 @@ export type DelegationSettingsGetEntityTagResponse = DelegationSettingsGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11878,7 +11932,7 @@ export type DelegationSettingsGetResponse = PortalDelegationSettings & Delegatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11903,7 +11957,7 @@ export type DelegationSettingsCreateOrUpdateResponse = PortalDelegationSettings
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11923,7 +11977,7 @@ export type ProductListByServiceResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11943,7 +11997,7 @@ export type ProductGetEntityTagResponse = ProductGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11958,7 +12012,7 @@ export type ProductGetResponse = ProductContract & ProductGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11983,7 +12037,7 @@ export type ProductCreateOrUpdateResponse = ProductContract & ProductCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12008,7 +12062,7 @@ export type ProductListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12028,7 +12082,7 @@ export type ProductListByServiceNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12048,7 +12102,7 @@ export type ProductListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12068,7 +12122,7 @@ export type ProductApiListByProductResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12088,7 +12142,7 @@ export type ProductApiCreateOrUpdateResponse = ApiContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12108,7 +12162,7 @@ export type ProductApiListByProductNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12128,7 +12182,7 @@ export type ProductGroupListByProductResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12148,7 +12202,7 @@ export type ProductGroupCreateOrUpdateResponse = GroupContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12168,7 +12222,7 @@ export type ProductGroupListByProductNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12188,7 +12242,7 @@ export type ProductSubscriptionsListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12208,7 +12262,7 @@ export type ProductSubscriptionsListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12228,7 +12282,7 @@ export type ProductPolicyListByProductResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12248,7 +12302,7 @@ export type ProductPolicyGetEntityTagResponse = ProductPolicyGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12263,7 +12317,7 @@ export type ProductPolicyGetResponse = PolicyContract & ProductPolicyGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12288,7 +12342,7 @@ export type ProductPolicyCreateOrUpdateResponse = PolicyContract & ProductPolicy
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12313,7 +12367,7 @@ export type PropertyListByServiceResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12333,7 +12387,7 @@ export type PropertyGetEntityTagResponse = PropertyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12348,7 +12402,7 @@ export type PropertyGetResponse = PropertyContract & PropertyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12373,7 +12427,7 @@ export type PropertyCreateOrUpdateResponse = PropertyContract & PropertyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12398,7 +12452,7 @@ export type PropertyListByServiceNextResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12418,7 +12472,7 @@ export type QuotaByCounterKeysListByServiceResponse = QuotaCounterCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12438,7 +12492,7 @@ export type QuotaByPeriodKeysGetResponse = QuotaCounterContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12458,7 +12512,7 @@ export type RegionListByServiceResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12478,7 +12532,7 @@ export type RegionListByServiceNextResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12498,7 +12552,7 @@ export type ReportsListByApiResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12518,7 +12572,7 @@ export type ReportsListByUserResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12538,7 +12592,7 @@ export type ReportsListByOperationResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12558,7 +12612,7 @@ export type ReportsListByProductResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12578,7 +12632,7 @@ export type ReportsListByGeoResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12598,7 +12652,7 @@ export type ReportsListBySubscriptionResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12618,7 +12672,7 @@ export type ReportsListByTimeResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12638,7 +12692,7 @@ export type ReportsListByRequestResponse = RequestReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12658,7 +12712,7 @@ export type ReportsListByApiNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12678,7 +12732,7 @@ export type ReportsListByUserNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12698,7 +12752,7 @@ export type ReportsListByOperationNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12718,7 +12772,7 @@ export type ReportsListByProductNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12738,7 +12792,7 @@ export type ReportsListByGeoNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12758,7 +12812,7 @@ export type ReportsListBySubscriptionNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12778,7 +12832,7 @@ export type ReportsListByTimeNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12798,7 +12852,7 @@ export type SubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12818,7 +12872,7 @@ export type SubscriptionGetEntityTagResponse = SubscriptionGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12833,7 +12887,7 @@ export type SubscriptionGetResponse = SubscriptionContract & SubscriptionGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12858,7 +12912,7 @@ export type SubscriptionCreateOrUpdateResponse = SubscriptionContract & Subscrip
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12883,7 +12937,7 @@ export type SubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12903,7 +12957,7 @@ export type TagResourceListByServiceResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12923,7 +12977,7 @@ export type TagResourceListByServiceNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12943,7 +12997,7 @@ export type TenantAccessGetEntityTagResponse = TenantAccessGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12958,7 +13012,7 @@ export type TenantAccessGetResponse = AccessInformationContract & TenantAccessGe
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12983,7 +13037,7 @@ export type TenantAccessGitGetResponse = AccessInformationContract & TenantAcces
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13008,7 +13062,7 @@ export type TenantConfigurationDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13028,7 +13082,7 @@ export type TenantConfigurationSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13048,7 +13102,7 @@ export type TenantConfigurationValidateResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13068,7 +13122,7 @@ export type TenantConfigurationGetSyncStateResponse = TenantConfigurationSyncSta
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13088,7 +13142,7 @@ export type TenantConfigurationBeginDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13108,7 +13162,7 @@ export type TenantConfigurationBeginSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13128,7 +13182,7 @@ export type TenantConfigurationBeginValidateResponse = OperationResultContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13148,7 +13202,7 @@ export type UserListByServiceResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13168,7 +13222,7 @@ export type UserGetEntityTagResponse = UserGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13183,7 +13237,7 @@ export type UserGetResponse = UserContract & UserGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13208,7 +13262,7 @@ export type UserCreateOrUpdateResponse = UserContract & UserCreateOrUpdateHeader
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13233,7 +13287,7 @@ export type UserGenerateSsoUrlResponse = GenerateSsoUrlResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13253,7 +13307,7 @@ export type UserGetSharedAccessTokenResponse = UserTokenResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13273,7 +13327,7 @@ export type UserListByServiceNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13293,7 +13347,7 @@ export type UserGroupListResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13313,7 +13367,7 @@ export type UserGroupListNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13333,7 +13387,7 @@ export type UserSubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13353,7 +13407,7 @@ export type UserSubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13373,7 +13427,7 @@ export type UserIdentitiesListResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13393,7 +13447,7 @@ export type UserIdentitiesListNextResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13413,7 +13467,7 @@ export type ApiExportGetResponse = ApiExportResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 6b65ce34b85f..60dd6c440a4f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -6,13 +6,13 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { CloudErrorMapper, BaseResourceMapper } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
 
-export const ErrorFieldContract: msRest.CompositeMapper = {
+export const ErrorFieldContract: coreHttp.CompositeMapper = {
   serializedName: "ErrorFieldContract",
   type: {
     name: "Composite",
@@ -40,7 +40,7 @@ export const ErrorFieldContract: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponseBody: msRest.CompositeMapper = {
+export const ErrorResponseBody: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponseBody",
   type: {
     name: "Composite",
@@ -74,7 +74,7 @@ export const ErrorResponseBody: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponse: msRest.CompositeMapper = {
+export const ErrorResponse: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponse",
   type: {
     name: "Composite",
@@ -108,7 +108,7 @@ export const ErrorResponse: msRest.CompositeMapper = {
   }
 };
 
-export const RegionContract: msRest.CompositeMapper = {
+export const RegionContract: coreHttp.CompositeMapper = {
   serializedName: "RegionContract",
   type: {
     name: "Composite",
@@ -137,7 +137,7 @@ export const RegionContract: msRest.CompositeMapper = {
   }
 };
 
-export const Resource: msRest.CompositeMapper = {
+export const Resource: coreHttp.CompositeMapper = {
   serializedName: "Resource",
   type: {
     name: "Composite",
@@ -168,7 +168,7 @@ export const Resource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResultValue: msRest.CompositeMapper = {
+export const ApiExportResultValue: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult_value",
   type: {
     name: "Composite",
@@ -184,7 +184,7 @@ export const ApiExportResultValue: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResult: msRest.CompositeMapper = {
+export const ApiExportResult: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult",
   type: {
     name: "Composite",
@@ -213,7 +213,7 @@ export const ApiExportResult: msRest.CompositeMapper = {
   }
 };
 
-export const ProductEntityBaseParameters: msRest.CompositeMapper = {
+export const ProductEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductEntityBaseParameters",
   type: {
     name: "Composite",
@@ -267,7 +267,7 @@ export const ProductEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
+export const ProductTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ProductTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -295,7 +295,7 @@ export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
+export const OperationTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "OperationTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -360,7 +360,7 @@ export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
+export const SubscriptionKeyParameterNamesContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionKeyParameterNamesContract",
   type: {
     name: "Composite",
@@ -382,7 +382,7 @@ export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OpenIdAuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OpenIdAuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -409,7 +409,7 @@ export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OAuth2AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OAuth2AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -431,7 +431,7 @@ export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -461,7 +461,7 @@ export const AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
+export const ApiVersionSetContractDetails: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContractDetails",
   type: {
     name: "Composite",
@@ -507,7 +507,7 @@ export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
+export const ApiCreateOrUpdatePropertiesWsdlSelector: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateProperties_wsdlSelector",
   type: {
     name: "Composite",
@@ -529,7 +529,7 @@ export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
   }
 };
 
-export const ApiEntityBaseContract: msRest.CompositeMapper = {
+export const ApiEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiEntityBaseContract",
   type: {
     name: "Composite",
@@ -627,7 +627,7 @@ export const ApiEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContractProperties: msRest.CompositeMapper = {
+export const ApiContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiContractProperties",
   type: {
     name: "Composite",
@@ -697,7 +697,7 @@ export const ApiContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
+export const ApiTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -759,7 +759,7 @@ export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagTagResourceContractProperties: msRest.CompositeMapper = {
+export const TagTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "TagTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -785,7 +785,7 @@ export const TagTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceContract: msRest.CompositeMapper = {
+export const TagResourceContract: coreHttp.CompositeMapper = {
   serializedName: "TagResourceContract",
   type: {
     name: "Composite",
@@ -824,7 +824,7 @@ export const TagResourceContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagContract: msRest.CompositeMapper = {
+export const TagContract: coreHttp.CompositeMapper = {
   serializedName: "TagContract",
   type: {
     name: "Composite",
@@ -846,7 +846,7 @@ export const TagContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionContract: msRest.CompositeMapper = {
+export const TagDescriptionContract: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionContract",
   type: {
     name: "Composite",
@@ -888,7 +888,7 @@ export const TagDescriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
+export const TagDescriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCreateParameters",
   type: {
     name: "Composite",
@@ -919,7 +919,7 @@ export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentContract: msRest.CompositeMapper = {
+export const IssueAttachmentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentContract",
   type: {
     name: "Composite",
@@ -951,7 +951,7 @@ export const IssueAttachmentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentContract: msRest.CompositeMapper = {
+export const IssueCommentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentContract",
   type: {
     name: "Composite",
@@ -982,7 +982,7 @@ export const IssueCommentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContractBaseProperties: msRest.CompositeMapper = {
+export const IssueContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "IssueContractBaseProperties",
   type: {
     name: "Composite",
@@ -1010,7 +1010,7 @@ export const IssueContractBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const IssueUpdateContract: msRest.CompositeMapper = {
+export const IssueUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "IssueUpdateContract",
   type: {
     name: "Composite",
@@ -1056,7 +1056,7 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContract: msRest.CompositeMapper = {
+export const IssueContract: coreHttp.CompositeMapper = {
   serializedName: "IssueContract",
   type: {
     name: "Composite",
@@ -1106,7 +1106,7 @@ export const IssueContract: msRest.CompositeMapper = {
   }
 };
 
-export const BodyDiagnosticSettings: msRest.CompositeMapper = {
+export const BodyDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "BodyDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1125,7 +1125,7 @@ export const BodyDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const HttpMessageDiagnostic: msRest.CompositeMapper = {
+export const HttpMessageDiagnostic: coreHttp.CompositeMapper = {
   serializedName: "HttpMessageDiagnostic",
   type: {
     name: "Composite",
@@ -1153,7 +1153,7 @@ export const HttpMessageDiagnostic: msRest.CompositeMapper = {
   }
 };
 
-export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
+export const PipelineDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "PipelineDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1177,7 +1177,7 @@ export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SamplingSettings: msRest.CompositeMapper = {
+export const SamplingSettings: coreHttp.CompositeMapper = {
   serializedName: "SamplingSettings",
   type: {
     name: "Composite",
@@ -1203,7 +1203,7 @@ export const SamplingSettings: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticContract: msRest.CompositeMapper = {
+export const DiagnosticContract: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticContract",
   type: {
     name: "Composite",
@@ -1254,7 +1254,7 @@ export const DiagnosticContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaContract: msRest.CompositeMapper = {
+export const SchemaContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaContract",
   type: {
     name: "Composite",
@@ -1278,7 +1278,7 @@ export const SchemaContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
+export const SchemaCreateOrUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaCreateOrUpdateContract",
   type: {
     name: "Composite",
@@ -1302,7 +1302,7 @@ export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyContract: msRest.CompositeMapper = {
+export const PolicyContract: coreHttp.CompositeMapper = {
   serializedName: "PolicyContract",
   type: {
     name: "Composite",
@@ -1327,7 +1327,7 @@ export const PolicyContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCollection: msRest.CompositeMapper = {
+export const PolicyCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicyCollection",
   type: {
     name: "Composite",
@@ -1355,7 +1355,7 @@ export const PolicyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductContract: msRest.CompositeMapper = {
+export const ProductContract: coreHttp.CompositeMapper = {
   serializedName: "ProductContract",
   type: {
     name: "Composite",
@@ -1421,7 +1421,7 @@ export const ProductContract: msRest.CompositeMapper = {
   }
 };
 
-export const ParameterContract: msRest.CompositeMapper = {
+export const ParameterContract: coreHttp.CompositeMapper = {
   serializedName: "ParameterContract",
   type: {
     name: "Composite",
@@ -1474,7 +1474,7 @@ export const ParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const RepresentationContract: msRest.CompositeMapper = {
+export const RepresentationContract: coreHttp.CompositeMapper = {
   serializedName: "RepresentationContract",
   type: {
     name: "Composite",
@@ -1521,7 +1521,7 @@ export const RepresentationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResponseContract: msRest.CompositeMapper = {
+export const ResponseContract: coreHttp.CompositeMapper = {
   serializedName: "ResponseContract",
   type: {
     name: "Composite",
@@ -1568,7 +1568,7 @@ export const ResponseContract: msRest.CompositeMapper = {
   }
 };
 
-export const RequestContract: msRest.CompositeMapper = {
+export const RequestContract: coreHttp.CompositeMapper = {
   serializedName: "RequestContract",
   type: {
     name: "Composite",
@@ -1620,7 +1620,7 @@ export const RequestContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationEntityBaseContract: msRest.CompositeMapper = {
+export const OperationEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "OperationEntityBaseContract",
   type: {
     name: "Composite",
@@ -1676,7 +1676,7 @@ export const OperationEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationUpdateContract: msRest.CompositeMapper = {
+export const OperationUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OperationUpdateContract",
   type: {
     name: "Composite",
@@ -1758,7 +1758,7 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationContract: msRest.CompositeMapper = {
+export const OperationContract: coreHttp.CompositeMapper = {
   serializedName: "OperationContract",
   type: {
     name: "Composite",
@@ -1844,7 +1844,7 @@ export const OperationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseContract: msRest.CompositeMapper = {
+export const ApiReleaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseContract",
   type: {
     name: "Composite",
@@ -1881,7 +1881,7 @@ export const ApiReleaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionContract: msRest.CompositeMapper = {
+export const ApiRevisionContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionContract",
   type: {
     name: "Composite",
@@ -1954,7 +1954,7 @@ export const ApiRevisionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiUpdateContract: msRest.CompositeMapper = {
+export const ApiUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "ApiUpdateContract",
   type: {
     name: "Composite",
@@ -2097,7 +2097,7 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContract: msRest.CompositeMapper = {
+export const ApiContract: coreHttp.CompositeMapper = {
   serializedName: "ApiContract",
   type: {
     name: "Composite",
@@ -2255,7 +2255,7 @@ export const ApiContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateParameter: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateParameter",
   type: {
     name: "Composite",
@@ -2437,7 +2437,7 @@ export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
+export const ApiVersionSetEntityBase: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetEntityBase",
   type: {
     name: "Composite",
@@ -2473,7 +2473,7 @@ export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
+export const ApiVersionSetUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetUpdateParameters",
   type: {
     name: "Composite",
@@ -2525,7 +2525,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContract: msRest.CompositeMapper = {
+export const ApiVersionSetContract: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContract",
   type: {
     name: "Composite",
@@ -2580,7 +2580,7 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
   }
 };
 
-export const TokenBodyParameterContract: msRest.CompositeMapper = {
+export const TokenBodyParameterContract: coreHttp.CompositeMapper = {
   serializedName: "TokenBodyParameterContract",
   type: {
     name: "Composite",
@@ -2604,7 +2604,7 @@ export const TokenBodyParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper = {
+export const AuthorizationServerContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContractBaseProperties",
   type: {
     name: "Composite",
@@ -2711,7 +2711,7 @@ export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper =
   }
 };
 
-export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
+export const AuthorizationServerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerUpdateContract",
   type: {
     name: "Composite",
@@ -2858,7 +2858,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContract: msRest.CompositeMapper = {
+export const AuthorizationServerContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContract",
   type: {
     name: "Composite",
@@ -3010,7 +3010,7 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendReconnectContract: msRest.CompositeMapper = {
+export const BackendReconnectContract: coreHttp.CompositeMapper = {
   serializedName: "BackendReconnectContract",
   type: {
     name: "Composite",
@@ -3027,7 +3027,7 @@ export const BackendReconnectContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendTlsProperties: msRest.CompositeMapper = {
+export const BackendTlsProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendTlsProperties",
   type: {
     name: "Composite",
@@ -3051,7 +3051,7 @@ export const BackendTlsProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProxyContract: msRest.CompositeMapper = {
+export const BackendProxyContract: coreHttp.CompositeMapper = {
   serializedName: "BackendProxyContract",
   type: {
     name: "Composite",
@@ -3084,7 +3084,7 @@ export const BackendProxyContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
+export const BackendAuthorizationHeaderCredentials: coreHttp.CompositeMapper = {
   serializedName: "BackendAuthorizationHeaderCredentials",
   type: {
     name: "Composite",
@@ -3116,7 +3116,7 @@ export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCredentialsContract: msRest.CompositeMapper = {
+export const BackendCredentialsContract: coreHttp.CompositeMapper = {
   serializedName: "BackendCredentialsContract",
   type: {
     name: "Composite",
@@ -3179,7 +3179,7 @@ export const BackendCredentialsContract: msRest.CompositeMapper = {
   }
 };
 
-export const X509CertificateName: msRest.CompositeMapper = {
+export const X509CertificateName: coreHttp.CompositeMapper = {
   serializedName: "X509CertificateName",
   type: {
     name: "Composite",
@@ -3201,7 +3201,7 @@ export const X509CertificateName: msRest.CompositeMapper = {
   }
 };
 
-export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
+export const BackendServiceFabricClusterProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendServiceFabricClusterProperties",
   type: {
     name: "Composite",
@@ -3259,7 +3259,7 @@ export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProperties: msRest.CompositeMapper = {
+export const BackendProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendProperties",
   type: {
     name: "Composite",
@@ -3276,7 +3276,7 @@ export const BackendProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendBaseParameters: msRest.CompositeMapper = {
+export const BackendBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendBaseParameters",
   type: {
     name: "Composite",
@@ -3344,7 +3344,7 @@ export const BackendBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendUpdateParameters: msRest.CompositeMapper = {
+export const BackendUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendUpdateParameters",
   type: {
     name: "Composite",
@@ -3428,7 +3428,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendContract: msRest.CompositeMapper = {
+export const BackendContract: coreHttp.CompositeMapper = {
   serializedName: "BackendContract",
   type: {
     name: "Composite",
@@ -3515,7 +3515,7 @@ export const BackendContract: msRest.CompositeMapper = {
   }
 };
 
-export const CacheUpdateParameters: msRest.CompositeMapper = {
+export const CacheUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CacheUpdateParameters",
   type: {
     name: "Composite",
@@ -3552,7 +3552,7 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const CacheContract: msRest.CompositeMapper = {
+export const CacheContract: coreHttp.CompositeMapper = {
   serializedName: "CacheContract",
   type: {
     name: "Composite",
@@ -3591,7 +3591,7 @@ export const CacheContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateContract: msRest.CompositeMapper = {
+export const CertificateContract: coreHttp.CompositeMapper = {
   serializedName: "CertificateContract",
   type: {
     name: "Composite",
@@ -3623,7 +3623,7 @@ export const CertificateContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CertificateCreateOrUpdateParameters",
   type: {
     name: "Composite",
@@ -3647,7 +3647,7 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSku: msRest.CompositeMapper = {
+export const ResourceSku: coreHttp.CompositeMapper = {
   serializedName: "ResourceSku",
   type: {
     name: "Composite",
@@ -3663,7 +3663,7 @@ export const ResourceSku: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuCapacity: msRest.CompositeMapper = {
+export const ResourceSkuCapacity: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuCapacity",
   type: {
     name: "Composite",
@@ -3701,7 +3701,7 @@ export const ResourceSkuCapacity: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResult: msRest.CompositeMapper = {
+export const ResourceSkuResult: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResult",
   type: {
     name: "Composite",
@@ -3734,7 +3734,7 @@ export const ResourceSkuResult: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateInformation: msRest.CompositeMapper = {
+export const CertificateInformation: coreHttp.CompositeMapper = {
   serializedName: "CertificateInformation",
   type: {
     name: "Composite",
@@ -3765,7 +3765,7 @@ export const CertificateInformation: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateConfiguration: msRest.CompositeMapper = {
+export const CertificateConfiguration: coreHttp.CompositeMapper = {
   serializedName: "CertificateConfiguration",
   type: {
     name: "Composite",
@@ -3801,7 +3801,7 @@ export const CertificateConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const HostnameConfiguration: msRest.CompositeMapper = {
+export const HostnameConfiguration: coreHttp.CompositeMapper = {
   serializedName: "HostnameConfiguration",
   type: {
     name: "Composite",
@@ -3864,7 +3864,7 @@ export const HostnameConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
+export const VirtualNetworkConfiguration: coreHttp.CompositeMapper = {
   serializedName: "VirtualNetworkConfiguration",
   type: {
     name: "Composite",
@@ -3897,7 +3897,7 @@ export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceSkuProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceSkuProperties",
   type: {
     name: "Composite",
@@ -3920,7 +3920,7 @@ export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
   }
 };
 
-export const AdditionalLocation: msRest.CompositeMapper = {
+export const AdditionalLocation: coreHttp.CompositeMapper = {
   serializedName: "AdditionalLocation",
   type: {
     name: "Composite",
@@ -3983,7 +3983,7 @@ export const AdditionalLocation: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceBackupRestoreParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBackupRestoreParameters",
   type: {
     name: "Composite",
@@ -4021,7 +4021,7 @@ export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBaseProperties",
   type: {
     name: "Composite",
@@ -4188,7 +4188,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
+export const ApiManagementServiceIdentity: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceIdentity",
   type: {
     name: "Composite",
@@ -4221,7 +4221,7 @@ export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
   }
 };
 
-export const ApimResource: msRest.CompositeMapper = {
+export const ApimResource: coreHttp.CompositeMapper = {
   serializedName: "ApimResource",
   type: {
     name: "Composite",
@@ -4263,7 +4263,7 @@ export const ApimResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceResource: msRest.CompositeMapper = {
+export const ApiManagementServiceResource: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceResource",
   type: {
     name: "Composite",
@@ -4480,7 +4480,7 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceUpdateParameters",
   type: {
     name: "Composite",
@@ -4687,7 +4687,7 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
+export const ApiManagementServiceGetSsoTokenResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceGetSsoTokenResult",
   type: {
     name: "Composite",
@@ -4703,7 +4703,7 @@ export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceCheckNameAvailabilityParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
   type: {
     name: "Composite",
@@ -4720,7 +4720,7 @@ export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.Composi
   }
 };
 
-export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
+export const ApiManagementServiceNameAvailabilityResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceNameAvailabilityResult",
   type: {
     name: "Composite",
@@ -4755,7 +4755,7 @@ export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceApplyNetworkConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
   type: {
     name: "Composite",
@@ -4771,7 +4771,7 @@ export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.Com
   }
 };
 
-export const OperationDisplay: msRest.CompositeMapper = {
+export const OperationDisplay: coreHttp.CompositeMapper = {
   serializedName: "Operation_display",
   type: {
     name: "Composite",
@@ -4805,7 +4805,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
   }
 };
 
-export const Operation: msRest.CompositeMapper = {
+export const Operation: coreHttp.CompositeMapper = {
   serializedName: "Operation",
   type: {
     name: "Composite",
@@ -4840,7 +4840,7 @@ export const Operation: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
+export const EmailTemplateParametersContractProperties: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateParametersContractProperties",
   type: {
     name: "Composite",
@@ -4882,7 +4882,7 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+export const EmailTemplateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateUpdateParameters",
   type: {
     name: "Composite",
@@ -4935,7 +4935,7 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
+export const EmailTemplateContract: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateContract",
   type: {
     name: "Composite",
@@ -4998,7 +4998,7 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityContract: msRest.CompositeMapper = {
+export const UserIdentityContract: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityContract",
   type: {
     name: "Composite",
@@ -5020,7 +5020,7 @@ export const UserIdentityContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserEntityBaseParameters: msRest.CompositeMapper = {
+export const UserEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "UserEntityBaseParameters",
   type: {
     name: "Composite",
@@ -5055,7 +5055,7 @@ export const UserEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContractProperties: msRest.CompositeMapper = {
+export const GroupContractProperties: coreHttp.CompositeMapper = {
   serializedName: "GroupContractProperties",
   type: {
     name: "Composite",
@@ -5109,7 +5109,7 @@ export const GroupContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const UserContract: msRest.CompositeMapper = {
+export const UserContract: coreHttp.CompositeMapper = {
   serializedName: "UserContract",
   type: {
     name: "Composite",
@@ -5182,7 +5182,7 @@ export const UserContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupUpdateParameters: msRest.CompositeMapper = {
+export const GroupUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
@@ -5225,7 +5225,7 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContract: msRest.CompositeMapper = {
+export const GroupContract: coreHttp.CompositeMapper = {
   serializedName: "GroupContract",
   type: {
     name: "Composite",
@@ -5280,7 +5280,7 @@ export const GroupContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateParameters: msRest.CompositeMapper = {
+export const GroupCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupCreateParameters",
   type: {
     name: "Composite",
@@ -5324,7 +5324,7 @@ export const GroupCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
+export const IdentityProviderBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderBaseParameters",
   type: {
     name: "Composite",
@@ -5396,7 +5396,7 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+export const IdentityProviderUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
@@ -5486,7 +5486,7 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
+export const IdentityProviderContract: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
@@ -5579,7 +5579,7 @@ export const IdentityProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerUpdateContract: msRest.CompositeMapper = {
+export const LoggerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerUpdateContract",
   type: {
     name: "Composite",
@@ -5618,7 +5618,7 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerContract: msRest.CompositeMapper = {
+export const LoggerContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerContract",
   type: {
     name: "Composite",
@@ -5669,7 +5669,7 @@ export const LoggerContract: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityStatusContract: msRest.CompositeMapper = {
+export const ConnectivityStatusContract: coreHttp.CompositeMapper = {
   serializedName: "ConnectivityStatusContract",
   type: {
     name: "Composite",
@@ -5716,7 +5716,7 @@ export const ConnectivityStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContract: msRest.CompositeMapper = {
+export const NetworkStatusContract: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContract",
   type: {
     name: "Composite",
@@ -5751,7 +5751,7 @@ export const NetworkStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
+export const NetworkStatusContractByLocation: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContractByLocation",
   type: {
     name: "Composite",
@@ -5777,7 +5777,7 @@ export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailContract: msRest.CompositeMapper = {
+export const RecipientEmailContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailContract",
   type: {
     name: "Composite",
@@ -5794,7 +5794,7 @@ export const RecipientEmailContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailCollection: msRest.CompositeMapper = {
+export const RecipientEmailCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailCollection",
   type: {
     name: "Composite",
@@ -5822,7 +5822,7 @@ export const RecipientEmailCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserContract: msRest.CompositeMapper = {
+export const RecipientUserContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserContract",
   type: {
     name: "Composite",
@@ -5839,7 +5839,7 @@ export const RecipientUserContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserCollection: msRest.CompositeMapper = {
+export const RecipientUserCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserCollection",
   type: {
     name: "Composite",
@@ -5867,7 +5867,7 @@ export const RecipientUserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientsContractProperties: msRest.CompositeMapper = {
+export const RecipientsContractProperties: coreHttp.CompositeMapper = {
   serializedName: "RecipientsContractProperties",
   type: {
     name: "Composite",
@@ -5899,7 +5899,7 @@ export const RecipientsContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationContract: msRest.CompositeMapper = {
+export const NotificationContract: coreHttp.CompositeMapper = {
   serializedName: "NotificationContract",
   type: {
     name: "Composite",
@@ -5934,7 +5934,7 @@ export const NotificationContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderUpdateContract",
   type: {
     name: "Composite",
@@ -5977,7 +5977,7 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderContract",
   type: {
     name: "Composite",
@@ -6024,7 +6024,7 @@ export const OpenidConnectProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetContract: msRest.CompositeMapper = {
+export const PolicySnippetContract: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetContract",
   type: {
     name: "Composite",
@@ -6062,7 +6062,7 @@ export const PolicySnippetContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetsCollection: msRest.CompositeMapper = {
+export const PolicySnippetsCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetsCollection",
   type: {
     name: "Composite",
@@ -6084,7 +6084,7 @@ export const PolicySnippetsCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper = {
+export const RegistrationDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "RegistrationDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6100,7 +6100,7 @@ export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper = {
+export const SubscriptionsDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionsDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6116,7 +6116,7 @@ export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const PortalDelegationSettings: msRest.CompositeMapper = {
+export const PortalDelegationSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalDelegationSettings",
   type: {
     name: "Composite",
@@ -6153,7 +6153,7 @@ export const PortalDelegationSettings: msRest.CompositeMapper = {
   }
 };
 
-export const TermsOfServiceProperties: msRest.CompositeMapper = {
+export const TermsOfServiceProperties: coreHttp.CompositeMapper = {
   serializedName: "TermsOfServiceProperties",
   type: {
     name: "Composite",
@@ -6181,7 +6181,7 @@ export const TermsOfServiceProperties: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSignupSettings: msRest.CompositeMapper = {
+export const PortalSignupSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSignupSettings",
   type: {
     name: "Composite",
@@ -6205,7 +6205,7 @@ export const PortalSignupSettings: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSigninSettings: msRest.CompositeMapper = {
+export const PortalSigninSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSigninSettings",
   type: {
     name: "Composite",
@@ -6222,7 +6222,7 @@ export const PortalSigninSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionContract: msRest.CompositeMapper = {
+export const SubscriptionContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionContract",
   type: {
     name: "Composite",
@@ -6336,7 +6336,7 @@ export const SubscriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ProductUpdateParameters: msRest.CompositeMapper = {
+export const ProductUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductUpdateParameters",
   type: {
     name: "Composite",
@@ -6400,7 +6400,7 @@ export const ProductUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
+export const PropertyEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyEntityBaseParameters",
   type: {
     name: "Composite",
@@ -6430,7 +6430,7 @@ export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyUpdateParameters: msRest.CompositeMapper = {
+export const PropertyUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyUpdateParameters",
   type: {
     name: "Composite",
@@ -6481,7 +6481,7 @@ export const PropertyUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyContract: msRest.CompositeMapper = {
+export const PropertyContract: coreHttp.CompositeMapper = {
   serializedName: "PropertyContract",
   type: {
     name: "Composite",
@@ -6535,7 +6535,7 @@ export const PropertyContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
+export const QuotaCounterValueContractProperties: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContractProperties",
   type: {
     name: "Composite",
@@ -6557,7 +6557,7 @@ export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterContract: msRest.CompositeMapper = {
+export const QuotaCounterContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterContract",
   type: {
     name: "Composite",
@@ -6608,7 +6608,7 @@ export const QuotaCounterContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterCollection: msRest.CompositeMapper = {
+export const QuotaCounterCollection: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterCollection",
   type: {
     name: "Composite",
@@ -6642,7 +6642,7 @@ export const QuotaCounterCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportRecordContract: msRest.CompositeMapper = {
+export const RequestReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "RequestReportRecordContract",
   type: {
     name: "Composite",
@@ -6762,7 +6762,7 @@ export const RequestReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const ReportRecordContract: msRest.CompositeMapper = {
+export const ReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "ReportRecordContract",
   type: {
     name: "Composite",
@@ -6930,7 +6930,7 @@ export const ReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
+export const SubscriptionUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionUpdateParameters",
   type: {
     name: "Composite",
@@ -7010,7 +7010,7 @@ export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateParameters: msRest.CompositeMapper = {
+export const SubscriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCreateParameters",
   type: {
     name: "Composite",
@@ -7084,7 +7084,7 @@ export const SubscriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateUpdateParameters: msRest.CompositeMapper = {
+export const TagCreateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagCreateUpdateParameters",
   type: {
     name: "Composite",
@@ -7105,7 +7105,7 @@ export const TagCreateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
+export const TenantConfigurationSyncStateContract: coreHttp.CompositeMapper = {
   serializedName: "TenantConfigurationSyncStateContract",
   type: {
     name: "Composite",
@@ -7157,7 +7157,7 @@ export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultLogItemContract: msRest.CompositeMapper = {
+export const OperationResultLogItemContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultLogItemContract",
   type: {
     name: "Composite",
@@ -7185,7 +7185,7 @@ export const OperationResultLogItemContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultContract: msRest.CompositeMapper = {
+export const OperationResultContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultContract",
   type: {
     name: "Composite",
@@ -7251,7 +7251,7 @@ export const OperationResultContract: msRest.CompositeMapper = {
   }
 };
 
-export const DeployConfigurationParameters: msRest.CompositeMapper = {
+export const DeployConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "DeployConfigurationParameters",
   type: {
     name: "Composite",
@@ -7274,7 +7274,7 @@ export const DeployConfigurationParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SaveConfigurationParameter: msRest.CompositeMapper = {
+export const SaveConfigurationParameter: coreHttp.CompositeMapper = {
   serializedName: "SaveConfigurationParameter",
   type: {
     name: "Composite",
@@ -7297,7 +7297,7 @@ export const SaveConfigurationParameter: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationContract: msRest.CompositeMapper = {
+export const AccessInformationContract: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationContract",
   type: {
     name: "Composite",
@@ -7331,7 +7331,7 @@ export const AccessInformationContract: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
+export const AccessInformationUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationUpdateParameters",
   type: {
     name: "Composite",
@@ -7347,7 +7347,7 @@ export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenResult: msRest.CompositeMapper = {
+export const UserTokenResult: coreHttp.CompositeMapper = {
   serializedName: "UserTokenResult",
   type: {
     name: "Composite",
@@ -7363,7 +7363,7 @@ export const UserTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenParameters: msRest.CompositeMapper = {
+export const UserTokenParameters: coreHttp.CompositeMapper = {
   serializedName: "UserTokenParameters",
   type: {
     name: "Composite",
@@ -7392,7 +7392,7 @@ export const UserTokenParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GenerateSsoUrlResult: msRest.CompositeMapper = {
+export const GenerateSsoUrlResult: coreHttp.CompositeMapper = {
   serializedName: "GenerateSsoUrlResult",
   type: {
     name: "Composite",
@@ -7408,7 +7408,7 @@ export const GenerateSsoUrlResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserUpdateParameters: msRest.CompositeMapper = {
+export const UserUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserUpdateParameters",
   type: {
     name: "Composite",
@@ -7479,7 +7479,7 @@ export const UserUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateParameters: msRest.CompositeMapper = {
+export const UserCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserCreateParameters",
   type: {
     name: "Composite",
@@ -7559,7 +7559,7 @@ export const UserCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionInfoContract: msRest.CompositeMapper = {
+export const ApiRevisionInfoContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionInfoContract",
   type: {
     name: "Composite",
@@ -7600,7 +7600,7 @@ export const ApiRevisionInfoContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContract: msRest.CompositeMapper = {
+export const QuotaCounterValueContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContract",
   type: {
     name: "Composite",
@@ -7622,7 +7622,7 @@ export const QuotaCounterValueContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7638,7 +7638,7 @@ export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetHeaders: msRest.CompositeMapper = {
+export const ApiGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-get-headers",
   type: {
     name: "Composite",
@@ -7654,7 +7654,7 @@ export const ApiGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7670,7 +7670,7 @@ export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7686,7 +7686,7 @@ export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-get-headers",
   type: {
     name: "Composite",
@@ -7702,7 +7702,7 @@ export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiReleaseCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7718,7 +7718,7 @@ export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7734,7 +7734,7 @@ export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-get-headers",
   type: {
     name: "Composite",
@@ -7750,7 +7750,7 @@ export const ApiOperationGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7766,7 +7766,7 @@ export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7782,7 +7782,7 @@ export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-get-headers",
   type: {
     name: "Composite",
@@ -7798,7 +7798,7 @@ export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7814,7 +7814,7 @@ export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyoperation-headers",
   type: {
     name: "Composite",
@@ -7830,7 +7830,7 @@ export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyoperation-headers",
   type: {
     name: "Composite",
@@ -7846,7 +7846,7 @@ export const TagGetByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7862,7 +7862,7 @@ export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-get-headers",
   type: {
     name: "Composite",
@@ -7878,7 +7878,7 @@ export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7894,7 +7894,7 @@ export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7910,7 +7910,7 @@ export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-get-headers",
   type: {
     name: "Composite",
@@ -7926,7 +7926,7 @@ export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiSchemaCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7942,7 +7942,7 @@ export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7958,7 +7958,7 @@ export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-get-headers",
   type: {
     name: "Composite",
@@ -7974,7 +7974,7 @@ export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7990,7 +7990,7 @@ export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8006,7 +8006,7 @@ export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-get-headers",
   type: {
     name: "Composite",
@@ -8022,7 +8022,7 @@ export const ApiIssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8038,7 +8038,7 @@ export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8054,7 +8054,7 @@ export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-get-headers",
   type: {
     name: "Composite",
@@ -8070,7 +8070,7 @@ export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8086,7 +8086,7 @@ export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8102,7 +8102,7 @@ export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-get-headers",
   type: {
     name: "Composite",
@@ -8118,7 +8118,7 @@ export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8134,7 +8134,7 @@ export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8150,7 +8150,7 @@ export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-get-headers",
   type: {
     name: "Composite",
@@ -8166,7 +8166,7 @@ export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8182,7 +8182,7 @@ export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyapi-headers",
   type: {
     name: "Composite",
@@ -8198,7 +8198,7 @@ export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByApiHeaders: msRest.CompositeMapper = {
+export const TagGetByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyapi-headers",
   type: {
     name: "Composite",
@@ -8214,7 +8214,7 @@ export const TagGetByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagAssignToApiHeaders: msRest.CompositeMapper = {
+export const TagAssignToApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-assigntoapi-headers",
   type: {
     name: "Composite",
@@ -8230,7 +8230,7 @@ export const TagAssignToApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8246,7 +8246,7 @@ export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-get-headers",
   type: {
     name: "Composite",
@@ -8262,7 +8262,7 @@ export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8278,7 +8278,7 @@ export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8294,7 +8294,7 @@ export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-get-headers",
   type: {
     name: "Composite",
@@ -8310,7 +8310,7 @@ export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8326,7 +8326,7 @@ export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper =
   }
 };
 
-export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
+export const BackendGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8342,7 +8342,7 @@ export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendGetHeaders: msRest.CompositeMapper = {
+export const BackendGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-get-headers",
   type: {
     name: "Composite",
@@ -8358,7 +8358,7 @@ export const BackendGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const BackendCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8374,7 +8374,7 @@ export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CacheGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8390,7 +8390,7 @@ export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetHeaders: msRest.CompositeMapper = {
+export const CacheGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-get-headers",
   type: {
     name: "Composite",
@@ -8406,7 +8406,7 @@ export const CacheGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CacheCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8422,7 +8422,7 @@ export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CertificateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8438,7 +8438,7 @@ export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetHeaders: msRest.CompositeMapper = {
+export const CertificateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-get-headers",
   type: {
     name: "Composite",
@@ -8454,7 +8454,7 @@ export const CertificateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8470,7 +8470,7 @@ export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8486,7 +8486,7 @@ export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-get-headers",
   type: {
     name: "Composite",
@@ -8502,7 +8502,7 @@ export const DiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const DiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8518,7 +8518,7 @@ export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8534,7 +8534,7 @@ export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-get-headers",
   type: {
     name: "Composite",
@@ -8550,7 +8550,7 @@ export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
+export const GroupGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8566,7 +8566,7 @@ export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetHeaders: msRest.CompositeMapper = {
+export const GroupGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-get-headers",
   type: {
     name: "Composite",
@@ -8582,7 +8582,7 @@ export const GroupGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const GroupCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8598,7 +8598,7 @@ export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8614,7 +8614,7 @@ export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-get-headers",
   type: {
     name: "Composite",
@@ -8630,7 +8630,7 @@ export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const IdentityProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8646,7 +8646,7 @@ export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IssueGetHeaders: msRest.CompositeMapper = {
+export const IssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "issue-get-headers",
   type: {
     name: "Composite",
@@ -8662,7 +8662,7 @@ export const IssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const LoggerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8678,7 +8678,7 @@ export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetHeaders: msRest.CompositeMapper = {
+export const LoggerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-get-headers",
   type: {
     name: "Composite",
@@ -8694,7 +8694,7 @@ export const LoggerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const LoggerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8710,7 +8710,7 @@ export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8726,7 +8726,7 @@ export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper =
   }
 };
 
-export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-get-headers",
   type: {
     name: "Composite",
@@ -8742,7 +8742,7 @@ export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8758,7 +8758,7 @@ export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper
   }
 };
 
-export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8774,7 +8774,7 @@ export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyGetHeaders: msRest.CompositeMapper = {
+export const PolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-get-headers",
   type: {
     name: "Composite",
@@ -8790,7 +8790,7 @@ export const PolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8806,7 +8806,7 @@ export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8822,7 +8822,7 @@ export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-get-headers",
   type: {
     name: "Composite",
@@ -8838,7 +8838,7 @@ export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8854,7 +8854,7 @@ export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-get-headers",
   type: {
     name: "Composite",
@@ -8870,7 +8870,7 @@ export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8886,7 +8886,7 @@ export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-get-headers",
   type: {
     name: "Composite",
@@ -8902,7 +8902,7 @@ export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8918,7 +8918,7 @@ export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetHeaders: msRest.CompositeMapper = {
+export const ProductGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-get-headers",
   type: {
     name: "Composite",
@@ -8934,7 +8934,7 @@ export const ProductGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8950,7 +8950,7 @@ export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8966,7 +8966,7 @@ export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-get-headers",
   type: {
     name: "Composite",
@@ -8982,7 +8982,7 @@ export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8998,7 +8998,7 @@ export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyproduct-headers",
   type: {
     name: "Composite",
@@ -9014,7 +9014,7 @@ export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByProductHeaders: msRest.CompositeMapper = {
+export const TagGetByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyproduct-headers",
   type: {
     name: "Composite",
@@ -9030,7 +9030,7 @@ export const TagGetByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PropertyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9046,7 +9046,7 @@ export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetHeaders: msRest.CompositeMapper = {
+export const PropertyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-get-headers",
   type: {
     name: "Composite",
@@ -9062,7 +9062,7 @@ export const PropertyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PropertyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9078,7 +9078,7 @@ export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9094,7 +9094,7 @@ export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-get-headers",
   type: {
     name: "Composite",
@@ -9110,7 +9110,7 @@ export const SubscriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const SubscriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9126,7 +9126,7 @@ export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystate-headers",
   type: {
     name: "Composite",
@@ -9142,7 +9142,7 @@ export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetHeaders: msRest.CompositeMapper = {
+export const TagGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-get-headers",
   type: {
     name: "Composite",
@@ -9158,7 +9158,7 @@ export const TagGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const TagCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9174,7 +9174,7 @@ export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9190,7 +9190,7 @@ export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-get-headers",
   type: {
     name: "Composite",
@@ -9206,7 +9206,7 @@ export const TenantAccessGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGitGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccessgit-get-headers",
   type: {
     name: "Composite",
@@ -9222,7 +9222,7 @@ export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
+export const UserGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9238,7 +9238,7 @@ export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetHeaders: msRest.CompositeMapper = {
+export const UserGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-get-headers",
   type: {
     name: "Composite",
@@ -9254,7 +9254,7 @@ export const UserGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const UserCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9270,7 +9270,7 @@ export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCollection: msRest.CompositeMapper = {
+export const ApiCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiCollection",
   type: {
     name: "Composite",
@@ -9300,7 +9300,7 @@ export const ApiCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceCollection: msRest.CompositeMapper = {
+export const TagResourceCollection: coreHttp.CompositeMapper = {
   serializedName: "TagResourceCollection",
   type: {
     name: "Composite",
@@ -9328,7 +9328,7 @@ export const TagResourceCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionCollection: msRest.CompositeMapper = {
+export const ApiRevisionCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionCollection",
   type: {
     name: "Composite",
@@ -9358,7 +9358,7 @@ export const ApiRevisionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCollection: msRest.CompositeMapper = {
+export const ApiReleaseCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseCollection",
   type: {
     name: "Composite",
@@ -9388,7 +9388,7 @@ export const ApiReleaseCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationCollection: msRest.CompositeMapper = {
+export const OperationCollection: coreHttp.CompositeMapper = {
   serializedName: "OperationCollection",
   type: {
     name: "Composite",
@@ -9418,7 +9418,7 @@ export const OperationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagCollection: msRest.CompositeMapper = {
+export const TagCollection: coreHttp.CompositeMapper = {
   serializedName: "TagCollection",
   type: {
     name: "Composite",
@@ -9446,7 +9446,7 @@ export const TagCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCollection: msRest.CompositeMapper = {
+export const ProductCollection: coreHttp.CompositeMapper = {
   serializedName: "ProductCollection",
   type: {
     name: "Composite",
@@ -9474,7 +9474,7 @@ export const ProductCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCollection: msRest.CompositeMapper = {
+export const SchemaCollection: coreHttp.CompositeMapper = {
   serializedName: "SchemaCollection",
   type: {
     name: "Composite",
@@ -9504,7 +9504,7 @@ export const SchemaCollection: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCollection: msRest.CompositeMapper = {
+export const DiagnosticCollection: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticCollection",
   type: {
     name: "Composite",
@@ -9532,7 +9532,7 @@ export const DiagnosticCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCollection: msRest.CompositeMapper = {
+export const IssueCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCollection",
   type: {
     name: "Composite",
@@ -9562,7 +9562,7 @@ export const IssueCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentCollection: msRest.CompositeMapper = {
+export const IssueCommentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentCollection",
   type: {
     name: "Composite",
@@ -9592,7 +9592,7 @@ export const IssueCommentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentCollection: msRest.CompositeMapper = {
+export const IssueAttachmentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentCollection",
   type: {
     name: "Composite",
@@ -9622,7 +9622,7 @@ export const IssueAttachmentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCollection: msRest.CompositeMapper = {
+export const TagDescriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCollection",
   type: {
     name: "Composite",
@@ -9650,7 +9650,7 @@ export const TagDescriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCollection: msRest.CompositeMapper = {
+export const ApiVersionSetCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetCollection",
   type: {
     name: "Composite",
@@ -9678,7 +9678,7 @@ export const ApiVersionSetCollection: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCollection: msRest.CompositeMapper = {
+export const AuthorizationServerCollection: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerCollection",
   type: {
     name: "Composite",
@@ -9712,7 +9712,7 @@ export const AuthorizationServerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCollection: msRest.CompositeMapper = {
+export const BackendCollection: coreHttp.CompositeMapper = {
   serializedName: "BackendCollection",
   type: {
     name: "Composite",
@@ -9740,7 +9740,7 @@ export const BackendCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCollection: msRest.CompositeMapper = {
+export const CacheCollection: coreHttp.CompositeMapper = {
   serializedName: "CacheCollection",
   type: {
     name: "Composite",
@@ -9768,7 +9768,7 @@ export const CacheCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCollection: msRest.CompositeMapper = {
+export const CertificateCollection: coreHttp.CompositeMapper = {
   serializedName: "CertificateCollection",
   type: {
     name: "Composite",
@@ -9796,7 +9796,7 @@ export const CertificateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationListResult: msRest.CompositeMapper = {
+export const OperationListResult: coreHttp.CompositeMapper = {
   serializedName: "OperationListResult",
   type: {
     name: "Composite",
@@ -9824,7 +9824,7 @@ export const OperationListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResults: msRest.CompositeMapper = {
+export const ResourceSkuResults: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResults",
   type: {
     name: "Composite",
@@ -9853,7 +9853,7 @@ export const ResourceSkuResults: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceListResult: msRest.CompositeMapper = {
+export const ApiManagementServiceListResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceListResult",
   type: {
     name: "Composite",
@@ -9882,7 +9882,7 @@ export const ApiManagementServiceListResult: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateCollection: msRest.CompositeMapper = {
+export const EmailTemplateCollection: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateCollection",
   type: {
     name: "Composite",
@@ -9910,7 +9910,7 @@ export const EmailTemplateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCollection: msRest.CompositeMapper = {
+export const GroupCollection: coreHttp.CompositeMapper = {
   serializedName: "GroupCollection",
   type: {
     name: "Composite",
@@ -9938,7 +9938,7 @@ export const GroupCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserCollection: msRest.CompositeMapper = {
+export const UserCollection: coreHttp.CompositeMapper = {
   serializedName: "UserCollection",
   type: {
     name: "Composite",
@@ -9966,7 +9966,7 @@ export const UserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderList: msRest.CompositeMapper = {
+export const IdentityProviderList: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderList",
   type: {
     name: "Composite",
@@ -9994,7 +9994,7 @@ export const IdentityProviderList: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCollection: msRest.CompositeMapper = {
+export const LoggerCollection: coreHttp.CompositeMapper = {
   serializedName: "LoggerCollection",
   type: {
     name: "Composite",
@@ -10028,7 +10028,7 @@ export const LoggerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationCollection: msRest.CompositeMapper = {
+export const NotificationCollection: coreHttp.CompositeMapper = {
   serializedName: "NotificationCollection",
   type: {
     name: "Composite",
@@ -10056,7 +10056,7 @@ export const NotificationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCollection: coreHttp.CompositeMapper = {
   serializedName: "OpenIdConnectProviderCollection",
   type: {
     name: "Composite",
@@ -10084,7 +10084,7 @@ export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCollection: msRest.CompositeMapper = {
+export const SubscriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCollection",
   type: {
     name: "Composite",
@@ -10112,7 +10112,7 @@ export const SubscriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCollection: msRest.CompositeMapper = {
+export const PropertyCollection: coreHttp.CompositeMapper = {
   serializedName: "PropertyCollection",
   type: {
     name: "Composite",
@@ -10140,7 +10140,7 @@ export const PropertyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegionListResult: msRest.CompositeMapper = {
+export const RegionListResult: coreHttp.CompositeMapper = {
   serializedName: "RegionListResult",
   type: {
     name: "Composite",
@@ -10174,7 +10174,7 @@ export const RegionListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ReportCollection: msRest.CompositeMapper = {
+export const ReportCollection: coreHttp.CompositeMapper = {
   serializedName: "ReportCollection",
   type: {
     name: "Composite",
@@ -10208,7 +10208,7 @@ export const ReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportCollection: msRest.CompositeMapper = {
+export const RequestReportCollection: coreHttp.CompositeMapper = {
   serializedName: "RequestReportCollection",
   type: {
     name: "Composite",
@@ -10236,7 +10236,7 @@ export const RequestReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityCollection: msRest.CompositeMapper = {
+export const UserIdentityCollection: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityCollection",
   type: {
     name: "Composite",
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index b300ade09092..d21da1dce55a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
@@ -8,9 +8,9 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 
-export const acceptLanguage: msRest.OperationParameter = {
+export const acceptLanguage: coreHttp.OperationParameter = {
   parameterPath: "acceptLanguage",
   mapper: {
     serializedName: "accept-language",
@@ -20,7 +20,7 @@ export const acceptLanguage: msRest.OperationParameter = {
     }
   }
 };
-export const accessName: msRest.OperationURLParameter = {
+export const accessName: coreHttp.OperationURLParameter = {
   parameterPath: "accessName",
   mapper: {
     required: true,
@@ -32,7 +32,7 @@ export const accessName: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId0: msRest.OperationURLParameter = {
+export const apiId0: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
@@ -47,22 +47,21 @@ export const apiId0: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId1: msRest.OperationURLParameter = {
+export const apiId1: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
     serializedName: "apiId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const apiVersion: msRest.OperationQueryParameter = {
+export const apiVersion: coreHttp.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
@@ -72,7 +71,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
     }
   }
 };
-export const attachmentId: msRest.OperationURLParameter = {
+export const attachmentId: coreHttp.OperationURLParameter = {
   parameterPath: "attachmentId",
   mapper: {
     required: true,
@@ -87,7 +86,7 @@ export const attachmentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const authsid: msRest.OperationURLParameter = {
+export const authsid: coreHttp.OperationURLParameter = {
   parameterPath: "authsid",
   mapper: {
     required: true,
@@ -102,22 +101,21 @@ export const authsid: msRest.OperationURLParameter = {
     }
   }
 };
-export const backendId: msRest.OperationURLParameter = {
+export const backendId: coreHttp.OperationURLParameter = {
   parameterPath: "backendId",
   mapper: {
     required: true,
     serializedName: "backendId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const cacheId: msRest.OperationURLParameter = {
+export const cacheId: coreHttp.OperationURLParameter = {
   parameterPath: "cacheId",
   mapper: {
     required: true,
@@ -132,7 +130,7 @@ export const cacheId: msRest.OperationURLParameter = {
     }
   }
 };
-export const certificateId: msRest.OperationURLParameter = {
+export const certificateId: coreHttp.OperationURLParameter = {
   parameterPath: "certificateId",
   mapper: {
     required: true,
@@ -147,7 +145,7 @@ export const certificateId: msRest.OperationURLParameter = {
     }
   }
 };
-export const commentId: msRest.OperationURLParameter = {
+export const commentId: coreHttp.OperationURLParameter = {
   parameterPath: "commentId",
   mapper: {
     required: true,
@@ -162,7 +160,7 @@ export const commentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const configurationName: msRest.OperationURLParameter = {
+export const configurationName: coreHttp.OperationURLParameter = {
   parameterPath: "configurationName",
   mapper: {
     required: true,
@@ -174,7 +172,7 @@ export const configurationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const deleteRevisions: msRest.OperationQueryParameter = {
+export const deleteRevisions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteRevisions"
@@ -186,7 +184,7 @@ export const deleteRevisions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const deleteSubscriptions: msRest.OperationQueryParameter = {
+export const deleteSubscriptions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteSubscriptions"
@@ -198,7 +196,7 @@ export const deleteSubscriptions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const diagnosticId: msRest.OperationURLParameter = {
+export const diagnosticId: coreHttp.OperationURLParameter = {
   parameterPath: "diagnosticId",
   mapper: {
     required: true,
@@ -213,7 +211,7 @@ export const diagnosticId: msRest.OperationURLParameter = {
     }
   }
 };
-export const email: msRest.OperationURLParameter = {
+export const email: coreHttp.OperationURLParameter = {
   parameterPath: "email",
   mapper: {
     required: true,
@@ -223,7 +221,7 @@ export const email: msRest.OperationURLParameter = {
     }
   }
 };
-export const expandApiVersionSet: msRest.OperationQueryParameter = {
+export const expandApiVersionSet: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandApiVersionSet"
@@ -235,7 +233,7 @@ export const expandApiVersionSet: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandCommentsAttachments: msRest.OperationQueryParameter = {
+export const expandCommentsAttachments: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandCommentsAttachments"
@@ -247,7 +245,7 @@ export const expandCommentsAttachments: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandGroups: msRest.OperationQueryParameter = {
+export const expandGroups: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandGroups"
@@ -259,7 +257,7 @@ export const expandGroups: msRest.OperationQueryParameter = {
     }
   }
 };
-export const exportParameter: msRest.OperationQueryParameter = {
+export const exportParameter: coreHttp.OperationQueryParameter = {
   parameterPath: "exportParameter",
   mapper: {
     required: true,
@@ -271,7 +269,7 @@ export const exportParameter: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter0: msRest.OperationQueryParameter = {
+export const filter0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "filter"
@@ -283,7 +281,7 @@ export const filter0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter1: msRest.OperationQueryParameter = {
+export const filter1: coreHttp.OperationQueryParameter = {
   parameterPath: "filter",
   mapper: {
     required: true,
@@ -293,7 +291,7 @@ export const filter1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const force: msRest.OperationQueryParameter = {
+export const force: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "force"
@@ -305,7 +303,7 @@ export const force: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format0: msRest.OperationQueryParameter = {
+export const format0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "format"
@@ -318,7 +316,7 @@ export const format0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format1: msRest.OperationQueryParameter = {
+export const format1: coreHttp.OperationQueryParameter = {
   parameterPath: "format",
   mapper: {
     required: true,
@@ -328,22 +326,21 @@ export const format1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const groupId: msRest.OperationURLParameter = {
+export const groupId: coreHttp.OperationURLParameter = {
   parameterPath: "groupId",
   mapper: {
     required: true,
     serializedName: "groupId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const identityProviderName: msRest.OperationURLParameter = {
+export const identityProviderName: coreHttp.OperationURLParameter = {
   parameterPath: "identityProviderName",
   mapper: {
     required: true,
@@ -353,7 +350,7 @@ export const identityProviderName: msRest.OperationURLParameter = {
     }
   }
 };
-export const ifMatch0: msRest.OperationParameter = {
+export const ifMatch0: coreHttp.OperationParameter = {
   parameterPath: [
     "options",
     "ifMatch"
@@ -365,7 +362,7 @@ export const ifMatch0: msRest.OperationParameter = {
     }
   }
 };
-export const ifMatch1: msRest.OperationParameter = {
+export const ifMatch1: coreHttp.OperationParameter = {
   parameterPath: "ifMatch",
   mapper: {
     required: true,
@@ -375,7 +372,7 @@ export const ifMatch1: msRest.OperationParameter = {
     }
   }
 };
-export const includeNotTaggedApis: msRest.OperationQueryParameter = {
+export const includeNotTaggedApis: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedApis"
@@ -387,7 +384,7 @@ export const includeNotTaggedApis: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
+export const includeNotTaggedOperations: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedOperations"
@@ -399,7 +396,7 @@ export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
+export const includeNotTaggedProducts: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedProducts"
@@ -411,7 +408,7 @@ export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
     }
   }
 };
-export const interval: msRest.OperationQueryParameter = {
+export const interval: coreHttp.OperationQueryParameter = {
   parameterPath: "interval",
   mapper: {
     required: true,
@@ -421,7 +418,7 @@ export const interval: msRest.OperationQueryParameter = {
     }
   }
 };
-export const issueId: msRest.OperationURLParameter = {
+export const issueId: coreHttp.OperationURLParameter = {
   parameterPath: "issueId",
   mapper: {
     required: true,
@@ -436,7 +433,7 @@ export const issueId: msRest.OperationURLParameter = {
     }
   }
 };
-export const locationName: msRest.OperationURLParameter = {
+export const locationName: coreHttp.OperationURLParameter = {
   parameterPath: "locationName",
   mapper: {
     required: true,
@@ -449,7 +446,7 @@ export const locationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const loggerId: msRest.OperationURLParameter = {
+export const loggerId: coreHttp.OperationURLParameter = {
   parameterPath: "loggerId",
   mapper: {
     required: true,
@@ -463,7 +460,7 @@ export const loggerId: msRest.OperationURLParameter = {
     }
   }
 };
-export const nextPageLink: msRest.OperationURLParameter = {
+export const nextPageLink: coreHttp.OperationURLParameter = {
   parameterPath: "nextPageLink",
   mapper: {
     required: true,
@@ -474,7 +471,7 @@ export const nextPageLink: msRest.OperationURLParameter = {
   },
   skipEncoding: true
 };
-export const notificationName: msRest.OperationURLParameter = {
+export const notificationName: coreHttp.OperationURLParameter = {
   parameterPath: "notificationName",
   mapper: {
     required: true,
@@ -484,7 +481,7 @@ export const notificationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const notify: msRest.OperationQueryParameter = {
+export const notify: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "notify"
@@ -496,22 +493,21 @@ export const notify: msRest.OperationQueryParameter = {
     }
   }
 };
-export const operationId: msRest.OperationURLParameter = {
+export const operationId: coreHttp.OperationURLParameter = {
   parameterPath: "operationId",
   mapper: {
     required: true,
     serializedName: "operationId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const opid: msRest.OperationURLParameter = {
+export const opid: coreHttp.OperationURLParameter = {
   parameterPath: "opid",
   mapper: {
     required: true,
@@ -525,7 +521,7 @@ export const opid: msRest.OperationURLParameter = {
     }
   }
 };
-export const orderby: msRest.OperationQueryParameter = {
+export const orderby: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "orderby"
@@ -537,7 +533,7 @@ export const orderby: msRest.OperationQueryParameter = {
     }
   }
 };
-export const policyId: msRest.OperationURLParameter = {
+export const policyId: coreHttp.OperationURLParameter = {
   parameterPath: "policyId",
   mapper: {
     required: true,
@@ -549,22 +545,21 @@ export const policyId: msRest.OperationURLParameter = {
     }
   }
 };
-export const productId: msRest.OperationURLParameter = {
+export const productId: coreHttp.OperationURLParameter = {
   parameterPath: "productId",
   mapper: {
     required: true,
     serializedName: "productId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const propId: msRest.OperationURLParameter = {
+export const propId: coreHttp.OperationURLParameter = {
   parameterPath: "propId",
   mapper: {
     required: true,
@@ -578,7 +573,7 @@ export const propId: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaCounterKey: msRest.OperationURLParameter = {
+export const quotaCounterKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaCounterKey",
   mapper: {
     required: true,
@@ -588,7 +583,7 @@ export const quotaCounterKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaPeriodKey: msRest.OperationURLParameter = {
+export const quotaPeriodKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaPeriodKey",
   mapper: {
     required: true,
@@ -598,7 +593,7 @@ export const quotaPeriodKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const releaseId: msRest.OperationURLParameter = {
+export const releaseId: coreHttp.OperationURLParameter = {
   parameterPath: "releaseId",
   mapper: {
     required: true,
@@ -613,7 +608,7 @@ export const releaseId: msRest.OperationURLParameter = {
     }
   }
 };
-export const resourceGroupName: msRest.OperationURLParameter = {
+export const resourceGroupName: coreHttp.OperationURLParameter = {
   parameterPath: "resourceGroupName",
   mapper: {
     required: true,
@@ -623,7 +618,7 @@ export const resourceGroupName: msRest.OperationURLParameter = {
     }
   }
 };
-export const schemaId: msRest.OperationURLParameter = {
+export const schemaId: coreHttp.OperationURLParameter = {
   parameterPath: "schemaId",
   mapper: {
     required: true,
@@ -638,7 +633,7 @@ export const schemaId: msRest.OperationURLParameter = {
     }
   }
 };
-export const scope0: msRest.OperationQueryParameter = {
+export const scope0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -650,7 +645,7 @@ export const scope0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const scope1: msRest.OperationQueryParameter = {
+export const scope1: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -669,7 +664,7 @@ export const scope1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const serviceName: msRest.OperationURLParameter = {
+export const serviceName: coreHttp.OperationURLParameter = {
   parameterPath: "serviceName",
   mapper: {
     required: true,
@@ -684,7 +679,7 @@ export const serviceName: msRest.OperationURLParameter = {
     }
   }
 };
-export const sid: msRest.OperationURLParameter = {
+export const sid: coreHttp.OperationURLParameter = {
   parameterPath: "sid",
   mapper: {
     required: true,
@@ -698,7 +693,7 @@ export const sid: msRest.OperationURLParameter = {
     }
   }
 };
-export const skip: msRest.OperationQueryParameter = {
+export const skip: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "skip"
@@ -713,7 +708,7 @@ export const skip: msRest.OperationQueryParameter = {
     }
   }
 };
-export const subscriptionId: msRest.OperationURLParameter = {
+export const subscriptionId: coreHttp.OperationURLParameter = {
   parameterPath: "subscriptionId",
   mapper: {
     required: true,
@@ -723,7 +718,7 @@ export const subscriptionId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tagId: msRest.OperationURLParameter = {
+export const tagId: coreHttp.OperationURLParameter = {
   parameterPath: "tagId",
   mapper: {
     required: true,
@@ -738,7 +733,7 @@ export const tagId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tags: msRest.OperationQueryParameter = {
+export const tags: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "tags"
@@ -750,7 +745,7 @@ export const tags: msRest.OperationQueryParameter = {
     }
   }
 };
-export const templateName: msRest.OperationURLParameter = {
+export const templateName: coreHttp.OperationURLParameter = {
   parameterPath: "templateName",
   mapper: {
     required: true,
@@ -760,7 +755,7 @@ export const templateName: msRest.OperationURLParameter = {
     }
   }
 };
-export const top: msRest.OperationQueryParameter = {
+export const top: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "top"
@@ -775,22 +770,21 @@ export const top: msRest.OperationQueryParameter = {
     }
   }
 };
-export const userId: msRest.OperationURLParameter = {
+export const userId: coreHttp.OperationURLParameter = {
   parameterPath: "userId",
   mapper: {
     required: true,
     serializedName: "userId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const versionSetId: msRest.OperationURLParameter = {
+export const versionSetId: coreHttp.OperationURLParameter = {
   parameterPath: "versionSetId",
   mapper: {
     required: true,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..62893a65e480 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiMappers";
 import * as Parameters from "../models/parameters";
@@ -40,15 +40,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,9 +162,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -175,7 +175,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -211,9 +211,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -223,7 +223,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,15 +261,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,9 +288,9 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param parameters Create or update parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -337,19 +337,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -361,8 +361,8 @@ export class Api {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis",
   urlParameters: [
@@ -392,7 +392,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -445,7 +445,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -477,7 +477,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -504,7 +504,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apisByTags",
   urlParameters: [
@@ -533,7 +533,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -575,7 +575,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -596,7 +596,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
index aac5ab05ff5e..e4834d6ce0c4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiDiagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiDiagnostic {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -72,7 +72,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,7 +81,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -115,7 +115,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,7 +124,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -134,8 +134,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ export class ApiDiagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -206,9 +206,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -220,7 +220,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -233,8 +233,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -259,9 +259,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -272,7 +272,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -305,19 +305,19 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -329,8 +329,8 @@ export class ApiDiagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics",
   urlParameters: [
@@ -359,7 +359,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -414,7 +414,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -454,7 +454,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -487,7 +487,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -514,7 +514,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
index eccbf4429a22..9ea84a86b30c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiExportMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiExport {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiExportGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class ApiExport {
    * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'Openapi'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class ApiExport {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiExportResult>, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiExportResult>, callback?: coreHttp.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -75,8 +75,8 @@ export class ApiExport {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..527626919d80 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiIssue {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,7 +161,7 @@ export class ApiIssue {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -171,8 +171,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -196,9 +196,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -209,7 +209,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -221,8 +221,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,9 +246,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -258,7 +258,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -269,8 +269,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -290,19 +290,19 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -314,8 +314,8 @@ export class ApiIssue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues",
   urlParameters: [
@@ -345,7 +345,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -401,7 +401,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -474,7 +474,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -501,7 +501,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
index 9392f644c44d..d4098f4441ba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueAttachmentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueAttachment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueAttachment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueAttachment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueAttachment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueAttachment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
index 8f4584a711ee..9938dad7fa57 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueCommentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueComment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueComment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueComment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueComment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueComment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
index 043449470e76..4b4a2370c112 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -31,17 +31,17 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -56,19 +56,19 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -80,8 +80,8 @@ export class ApiManagementOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "providers/Microsoft.ApiManagement/operations",
   queryParameters: [
@@ -101,7 +101,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
index e098f991f33b..4def1deb0c6a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceRestoreResponse>
    */
-  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
+  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
     return this.beginRestore(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceRestoreResponse>;
   }
@@ -52,7 +52,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceBackupResponse>
    */
-  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
+  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
     return this.beginBackup(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceBackupResponse>;
   }
@@ -66,7 +66,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
     return this.beginCreateOrUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceCreateOrUpdateResponse>;
   }
@@ -79,7 +79,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
     return this.beginUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceUpdateResponse>;
   }
@@ -91,21 +91,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceResource>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceResource>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -123,7 +123,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceDeleteMethodResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
     return this.beginDeleteMethod(resourceGroupName,serviceName,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceDeleteMethodResponse>;
   }
@@ -134,19 +134,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupResponse>
    */
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
+  listByResourceGroup(resourceGroupName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,17 +161,17 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -187,21 +187,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetSsoTokenResponse>
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
+  getSsoToken(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,19 +218,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
     return this.client.sendOperationRequest(
       {
         parameters,
@@ -262,9 +262,9 @@ export class ApiManagementService {
    * @param parameters Parameters supplied to the Restore API Management service from backup
    * operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the ApiManagementService_Backup operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -304,9 +304,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -324,9 +324,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -343,9 +343,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -362,9 +362,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -381,19 +381,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>
    */
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
+  listByResourceGroupNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -409,19 +409,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -433,8 +433,8 @@ export class ApiManagementService {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -459,7 +459,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByResourceGroupOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -483,7 +483,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listOperationSpec: msRest.OperationSpec = {
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -506,7 +506,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSsoTokenOperationSpec: msRest.OperationSpec = {
+const getSsoTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/getssotoken",
   urlParameters: [
@@ -531,7 +531,7 @@ const getSsoTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
+const checkNameAvailabilityOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/checkNameAvailability",
   urlParameters: [
@@ -561,7 +561,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginRestoreOperationSpec: msRest.OperationSpec = {
+const beginRestoreOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore",
   urlParameters: [
@@ -594,7 +594,7 @@ const beginRestoreOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginBackupOperationSpec: msRest.OperationSpec = {
+const beginBackupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup",
   urlParameters: [
@@ -627,7 +627,7 @@ const beginBackupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -663,7 +663,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginUpdateOperationSpec: msRest.OperationSpec = {
+const beginUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -696,7 +696,7 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
+const beginDeleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -723,7 +723,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec = {
+const beginApplyNetworkConfigurationUpdatesOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/applynetworkconfigurationupdates",
   urlParameters: [
@@ -756,7 +756,7 @@ const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec =
   serializer
 };
 
-const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -777,7 +777,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
index 4ed93c82e480..4df1cfc2e754 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceSkusMappers";
 import * as Parameters from "../models/parameters";
@@ -34,21 +34,21 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,19 +66,19 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
+  listAvailableServiceSkusNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -90,8 +90,8 @@ export class ApiManagementServiceSkus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listAvailableServiceSkusOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/skus",
   urlParameters: [
@@ -116,7 +116,7 @@ const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listAvailableServiceSkusNextOperationSpec: msRest.OperationSpec = {
+const listAvailableServiceSkusNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
index 02d3a4495eeb..ddffaedd4f02 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiOperation {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiOperation {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,9 +219,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,7 +234,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -248,8 +248,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -275,9 +275,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -289,7 +289,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -323,19 +323,19 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -347,8 +347,8 @@ export class ApiOperation {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations",
   urlParameters: [
@@ -378,7 +378,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -433,7 +433,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -473,7 +473,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -506,7 +506,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -533,7 +533,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
index 7e7f6bd110f5..d88c547584b8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyListByOperationResponse>
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,7 +93,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -104,8 +104,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -150,8 +150,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -187,7 +187,7 @@ export class ApiOperationPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -199,8 +199,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class ApiOperationPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -239,7 +239,7 @@ export class ApiOperationPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -252,8 +252,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,8 +269,8 @@ export class ApiOperationPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies",
   urlParameters: [
@@ -297,7 +297,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -325,7 +325,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -355,7 +355,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -396,7 +396,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
index 4d5ddbc68485..bf30180cb129 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyListByApiResponse>
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ApiPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ApiPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ApiPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ApiPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
index 10e07fb486f2..4c89bf24cdf0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiProductMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiProduct {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiProduct {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiProduct {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiProductListByApisNextResponse>
    */
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
+  listByApisNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiProduct {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApisOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApisOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/products",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByApisOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApisNextOperationSpec: msRest.OperationSpec = {
+const listByApisNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
index f0d3cedeb6d3..5b56128c5d1a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiReleaseMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiRelease {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -51,8 +51,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -83,7 +83,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,8 +93,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -126,7 +126,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -136,8 +136,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,7 +171,7 @@ export class ApiRelease {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -182,8 +182,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -208,9 +208,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -235,8 +235,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,9 +261,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -274,7 +274,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -333,8 +333,8 @@ export class ApiRelease {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases",
   urlParameters: [
@@ -363,7 +363,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -390,7 +390,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -491,7 +491,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -518,7 +518,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
index 837ccbc609f9..7aefdbed97bf 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiRevisionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiRevision {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiRevision {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiRevision {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiRevisionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiRevision {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/revisions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
index da91eb979f4d..5ec72748bd7f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiSchemaMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiSchema {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiSchema {
    * @param parameters The schema contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,9 +218,9 @@ export class ApiSchema {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -232,7 +232,7 @@ export class ApiSchema {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,8 +245,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class ApiSchema {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas",
   urlParameters: [
@@ -320,7 +320,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -347,7 +347,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -375,7 +375,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -415,7 +415,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
index dd13e851c706..7a81f3426756 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiTagDescriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -44,7 +44,7 @@ export class ApiTagDescription {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -53,8 +53,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,7 +85,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,8 +95,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,7 +128,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -138,8 +138,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ApiTagDescription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -184,8 +184,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,9 +209,9 @@ export class ApiTagDescription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiTagDescription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -256,19 +256,19 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -280,8 +280,8 @@ export class ApiTagDescription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions",
   urlParameters: [
@@ -310,7 +310,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -365,7 +365,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -432,7 +432,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
index 5f6861172541..b1c965b849a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiVersionSetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class ApiVersionSet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class ApiVersionSet {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class ApiVersionSet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 8a3182d35653..26d8f5932dac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/authorizationServerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class AuthorizationServer {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class AuthorizationServer {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class AuthorizationServer {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..eb5e19210589 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/backendMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Backend {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetResponse>;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
+  get(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Backend {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Backend {
    * @param backendId Identifier of the Backend entity. Must be unique in the current API Management
    * service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<msRest.RestResponse>;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,19 +321,19 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -345,8 +345,8 @@ export class Backend {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends",
   urlParameters: [
@@ -374,7 +374,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -400,7 +400,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -427,7 +427,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -466,7 +466,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -498,7 +498,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -524,7 +524,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const reconnectOperationSpec: msRest.OperationSpec = {
+const reconnectOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}/reconnect",
   urlParameters: [
@@ -555,7 +555,7 @@ const reconnectOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..0229ff2d39ac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/cacheMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Cache {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetResponse>;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Cache {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Cache {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches",
   urlParameters: [
@@ -333,7 +333,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -359,7 +359,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -425,7 +425,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -457,7 +457,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -483,7 +483,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
index f47a28ce34f4..2cee16d8e3fe 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/certificateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Certificate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Certificate {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,9 +188,9 @@ export class Certificate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -200,7 +200,7 @@ export class Certificate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -211,8 +211,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -231,19 +231,19 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -255,8 +255,8 @@ export class Certificate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates",
   urlParameters: [
@@ -284,7 +284,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -310,7 +310,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -376,7 +376,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -402,7 +402,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
index e1289ca3ddd1..47fe7384cdb0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/delegationSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class DelegationSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class DelegationSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class DelegationSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class DelegationSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..c537d80aeea7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/diagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Diagnostic {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Diagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Diagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..feac8aa81707 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/emailTemplateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class EmailTemplate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,7 +73,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -87,7 +87,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -102,8 +102,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -130,7 +130,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -144,7 +144,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,8 +159,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class EmailTemplate {
    * @param parameters Email Template update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -219,8 +219,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -249,9 +249,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -268,7 +268,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -316,9 +316,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,7 +334,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -351,8 +351,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -371,19 +371,19 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -395,8 +395,8 @@ export class EmailTemplate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates",
   urlParameters: [
@@ -424,7 +424,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -477,7 +477,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -514,7 +514,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -546,7 +546,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -572,7 +572,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..f3e9fed92627 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Group {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetResponse>;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
+  get(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Group {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Group {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
index 819dff540d27..5a1f81e9495c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupUserMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
+  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -111,7 +111,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCreateResponse>
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,7 +119,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -149,9 +149,9 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,7 +159,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -168,8 +168,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,19 +188,19 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -212,8 +212,8 @@ export class GroupUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users",
   urlParameters: [
@@ -242,7 +242,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -268,7 +268,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOperationSpec: msRest.OperationSpec = {
+const createOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -298,7 +298,7 @@ const createOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -324,7 +324,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index a9dc72ce8502..6881b4086f45 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/identityProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class IdentityProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -282,19 +282,19 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -306,8 +306,8 @@ export class IdentityProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders",
   urlParameters: [
@@ -332,7 +332,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -358,7 +358,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -385,7 +385,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -424,7 +424,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -456,7 +456,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -482,7 +482,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
index 74263bc8328b..5bf06e0ce889 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/issueMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Issue {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueGetResponse>;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Issue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -100,19 +100,19 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -124,8 +124,8 @@ export class Issue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues",
   urlParameters: [
@@ -153,7 +153,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues/{issueId}",
   urlParameters: [
@@ -180,7 +180,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
index ceea06065217..d32282984e6c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/loggerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Logger {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Logger {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Logger {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -470,7 +470,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
index 4a2e2f094b53..2e3813915fc3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/networkStatusMappers";
 import * as Parameters from "../models/parameters";
@@ -35,21 +35,21 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByLocationResponse>
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class NetworkStatus {
    * Azure Regions like West US, East US, South Central US.
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class NetworkStatus {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContract>, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContract>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -103,8 +103,8 @@ export class NetworkStatus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/networkstatus",
   urlParameters: [
@@ -140,7 +140,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByLocationOperationSpec: msRest.OperationSpec = {
+const listByLocationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/locations/{locationName}/networkstatus",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
index ee40ffce7f34..de481b030736 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Notification {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -69,7 +69,7 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -90,8 +90,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -135,8 +135,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -154,19 +154,19 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -178,8 +178,8 @@ export class Notification {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications",
   urlParameters: [
@@ -206,7 +206,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -232,7 +232,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -259,7 +259,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
index 33904e45df9c..ebfd03f497fd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientEmailMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailCollection>, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailContract>, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailContract>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param email Email identifier.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientEmail {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
index 0f5df0fb3ac3..0cfc112d1d85 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientUserMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserCollection>, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserContract>, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserContract>, callback?: coreHttp.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
index 6b7772a13ea3..200f347aa0f1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/openIdConnectProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class OpenIdConnectProvider {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class OpenIdConnectProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class OpenIdConnectProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
index 770b86b58870..7338254dd123 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/operationOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class OperationOperations {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class OperationOperations {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class OperationOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.OperationListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class OperationOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operationsByTags",
   urlParameters: [
@@ -126,7 +126,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
index f9736328e80a..b9e89e968493 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policyMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,21 +66,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -104,15 +104,15 @@ export class Policy {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,7 +138,7 @@ export class Policy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -146,8 +146,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class Policy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -176,7 +176,7 @@ export class Policy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -185,8 +185,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,8 +200,8 @@ export class Policy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies",
   urlParameters: [
@@ -226,7 +226,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -252,7 +252,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -280,7 +280,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -319,7 +319,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
index d0ba7845bb1f..74b9659c45b9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policySnippetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class PolicySnippet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicySnippetsCollection>, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PolicySnippetsCollection>, callback?: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -60,8 +60,8 @@ export class PolicySnippet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policySnippets",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
index 31904c098334..173a8de78133 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetResponse>;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Product {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,15 +288,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -313,19 +313,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -341,19 +341,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -365,8 +365,8 @@ export class Product {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products",
   urlParameters: [
@@ -396,7 +396,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -422,7 +422,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -449,7 +449,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -488,7 +488,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -520,7 +520,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -547,7 +547,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/productsByTags",
   urlParameters: [
@@ -576,7 +576,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -597,7 +597,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
index c3bad7380501..29721dc07229 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productApiMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductApi {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,9 +74,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -178,7 +178,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -189,8 +189,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,19 +209,19 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -233,8 +233,8 @@ export class ProductApi {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis",
   urlParameters: [
@@ -263,7 +263,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -318,7 +318,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -344,7 +344,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
index d40911e555c8..67f7c51eda2e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductGroup {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,9 +73,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,7 +84,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,8 +94,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -127,7 +127,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -137,8 +137,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -159,9 +159,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -170,7 +170,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,19 +200,19 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -224,8 +224,8 @@ export class ProductGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups",
   urlParameters: [
@@ -254,7 +254,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -279,7 +279,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -309,7 +309,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -335,7 +335,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
index bd7e68b41ad9..a47a83954212 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyListByProductResponse>
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ProductPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ProductPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ProductPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ProductPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
index df3e0fbae8f6..78ae6452d116 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productSubscriptionsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductSubscriptions {
    * instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductSubscriptions {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class ProductSubscriptions {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductSubscriptionsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class ProductSubscriptions {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/subscriptions",
   urlParameters: [
@@ -125,7 +125,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
index af83fe7a925d..432482302489 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/propertyMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Property {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Property {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Property {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
index e4976fa216f6..06ca471204a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByCounterKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class QuotaByCounterKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByCounterKeysListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterCollection>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,9 +83,9 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,7 +96,7 @@ export class QuotaByCounterKeys {
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -108,8 +108,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class QuotaByCounterKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
@@ -151,7 +151,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..41f8e762396b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByPeriodKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -39,7 +39,7 @@ export class QuotaByPeriodKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByPeriodKeysGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -50,7 +50,7 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -62,8 +62,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterContract>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -87,9 +87,9 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -101,7 +101,7 @@ export class QuotaByPeriodKeys {
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,8 +114,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,8 +131,8 @@ export class QuotaByPeriodKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
@@ -159,7 +159,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
index a563773df876..12217e5f5dd2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/regionMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class Region {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/regions",
   urlParameters: [
@@ -114,7 +114,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
index 328d1f592dab..2f5ab070e0e2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/reportsMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class Reports {
    * @param filter The filter to apply on the operation.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -101,7 +101,7 @@ export class Reports {
    * | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -121,8 +121,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -193,8 +193,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -243,7 +243,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -314,7 +314,7 @@ export class Reports {
    * | </br>
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,8 +334,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -384,7 +384,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -403,8 +403,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -461,7 +461,7 @@ export class Reports {
    * TimeSpan(hours, minutes, seconds)).
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -484,8 +484,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -521,7 +521,7 @@ export class Reports {
    * filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -533,8 +533,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | msRest.ServiceCallback<Models.RequestReportCollection>, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | coreHttp.ServiceCallback<Models.RequestReportCollection>, callback?: coreHttp.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -552,19 +552,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -580,19 +580,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByUserNextResponse>
    */
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
+  listByUserNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -608,19 +608,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -636,19 +636,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -664,19 +664,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByGeoNextResponse>
    */
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
+  listByGeoNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -692,19 +692,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListBySubscriptionNextResponse>
    */
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
+  listBySubscriptionNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -720,19 +720,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByTimeNextResponse>
    */
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
+  listByTimeNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -744,8 +744,8 @@ export class Reports {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byApi",
   urlParameters: [
@@ -774,7 +774,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserOperationSpec: msRest.OperationSpec = {
+const listByUserOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byUser",
   urlParameters: [
@@ -803,7 +803,7 @@ const listByUserOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byOperation",
   urlParameters: [
@@ -832,7 +832,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byProduct",
   urlParameters: [
@@ -861,7 +861,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoOperationSpec: msRest.OperationSpec = {
+const listByGeoOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byGeo",
   urlParameters: [
@@ -889,7 +889,7 @@ const listByGeoOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/bySubscription",
   urlParameters: [
@@ -918,7 +918,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeOperationSpec: msRest.OperationSpec = {
+const listByTimeOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byTime",
   urlParameters: [
@@ -948,7 +948,7 @@ const listByTimeOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByRequestOperationSpec: msRest.OperationSpec = {
+const listByRequestOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byRequest",
   urlParameters: [
@@ -976,7 +976,7 @@ const listByRequestOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -997,7 +997,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserNextOperationSpec: msRest.OperationSpec = {
+const listByUserNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1018,7 +1018,7 @@ const listByUserNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1039,7 +1039,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1060,7 +1060,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoNextOperationSpec: msRest.OperationSpec = {
+const listByGeoNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1081,7 +1081,7 @@ const listByGeoNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1102,7 +1102,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeNextOperationSpec: msRest.OperationSpec = {
+const listByTimeNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
index dd971ea317b3..aa821fe29d3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signInSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignInSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignInSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignInSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignInSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
index bd3214a4dffd..036908e63887 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signUpSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignUpSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignUpSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignUpSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignUpSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
index 630cfbf109fc..c665a6438d1f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/subscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Subscription {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class Subscription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -322,9 +322,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -332,7 +332,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -341,8 +341,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -360,19 +360,19 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -384,8 +384,8 @@ export class Subscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions",
   urlParameters: [
@@ -413,7 +413,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -439,7 +439,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -466,7 +466,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -506,7 +506,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -539,7 +539,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -565,7 +565,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regeneratePrimaryKey",
   urlParameters: [
@@ -589,7 +589,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regenerateSecondaryKey",
   urlParameters: [
@@ -613,7 +613,7 @@ const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..b8b1bf0c9d72 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagMappers";
 import * as Parameters from "../models/parameters";
@@ -47,7 +47,7 @@ export class Tag {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -84,7 +84,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByOperationResponse>
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,7 +95,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -107,8 +107,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -134,7 +134,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByOperationResponse>
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -145,7 +145,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -157,8 +157,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -184,7 +184,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToOperationResponse>
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -195,7 +195,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,8 +207,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -232,9 +232,9 @@ export class Tag {
    * Management service instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,7 +245,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -257,8 +257,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -289,7 +289,7 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -298,8 +298,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,7 +321,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByApiResponse>
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -330,7 +330,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -340,8 +340,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -364,7 +364,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByApiResponse>
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -373,7 +373,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -383,8 +383,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -407,7 +407,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToApiResponse>
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -416,7 +416,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -426,8 +426,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -448,9 +448,9 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -459,7 +459,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -469,8 +469,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -500,7 +500,7 @@ export class Tag {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -509,8 +509,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -532,7 +532,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByProductResponse>
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -541,7 +541,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -551,8 +551,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -575,7 +575,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByProductResponse>
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -584,7 +584,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -594,8 +594,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -618,7 +618,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToProductResponse>
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -627,7 +627,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -637,8 +637,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -659,9 +659,9 @@ export class Tag {
    * instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -670,7 +670,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -680,8 +680,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -707,15 +707,15 @@ export class Tag {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -734,14 +734,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateResponse>
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -749,8 +749,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -770,14 +770,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetResponse>;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -785,8 +785,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
+  get(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -815,7 +815,7 @@ export class Tag {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -824,8 +824,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -847,9 +847,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -859,7 +859,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -870,8 +870,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -893,9 +893,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -904,7 +904,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -914,8 +914,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -934,19 +934,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -962,19 +962,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -990,19 +990,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1018,19 +1018,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1042,8 +1042,8 @@ export class Tag {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags",
   urlParameters: [
@@ -1073,7 +1073,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
+const getEntityStateByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1101,7 +1101,7 @@ const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByOperationOperationSpec: msRest.OperationSpec = {
+const getByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1130,7 +1130,7 @@ const getByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToOperationOperationSpec: msRest.OperationSpec = {
+const assignToOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1161,7 +1161,7 @@ const assignToOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromOperationOperationSpec: msRest.OperationSpec = {
+const detachFromOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1188,7 +1188,7 @@ const detachFromOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiOperationSpec: msRest.OperationSpec = {
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags",
   urlParameters: [
@@ -1217,7 +1217,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
+const getEntityStateByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1244,7 +1244,7 @@ const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByApiOperationSpec: msRest.OperationSpec = {
+const getByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1272,7 +1272,7 @@ const getByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToApiOperationSpec: msRest.OperationSpec = {
+const assignToApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1304,7 +1304,7 @@ const assignToApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromApiOperationSpec: msRest.OperationSpec = {
+const detachFromApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1330,7 +1330,7 @@ const detachFromApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags",
   urlParameters: [
@@ -1359,7 +1359,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
+const getEntityStateByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1386,7 +1386,7 @@ const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByProductOperationSpec: msRest.OperationSpec = {
+const getByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1414,7 +1414,7 @@ const getByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToProductOperationSpec: msRest.OperationSpec = {
+const assignToProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1444,7 +1444,7 @@ const assignToProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromProductOperationSpec: msRest.OperationSpec = {
+const detachFromProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1470,7 +1470,7 @@ const detachFromProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags",
   urlParameters: [
@@ -1499,7 +1499,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateOperationSpec: msRest.OperationSpec = {
+const getEntityStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1525,7 +1525,7 @@ const getEntityStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1552,7 +1552,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1591,7 +1591,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1623,7 +1623,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1649,7 +1649,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1670,7 +1670,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1691,7 +1691,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1712,7 +1712,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
index b662081c7fcb..174b64c28bd7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagResourceMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class TagResource {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class TagResource {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagResourceListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class TagResource {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tagResources",
   urlParameters: [
@@ -117,7 +117,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index 79018f752dfd..f4a53f233db4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class TenantAccess {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class TenantAccess {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class TenantAccess {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,23 +138,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -170,23 +170,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -199,8 +199,8 @@ export class TenantAccess {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -226,7 +226,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -253,7 +253,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -285,7 +285,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regeneratePrimaryKey",
   urlParameters: [
@@ -309,7 +309,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
index c7fbd0f24509..f29079060881 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessGitMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccessGit {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGitGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,23 +63,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -95,23 +95,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class TenantAccessGit {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git",
   urlParameters: [
@@ -152,7 +152,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regeneratePrimaryKey",
   urlParameters: [
@@ -176,7 +176,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
index be1e84173988..fefb4e8f6dd4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantConfigurationMappers";
 import * as Parameters from "../models/parameters";
@@ -36,7 +36,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationDeployResponse>
    */
-  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
+  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
     return this.beginDeploy(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationDeployResponse>;
   }
@@ -50,7 +50,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationSaveResponse>
    */
-  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
+  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
     return this.beginSave(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationSaveResponse>;
   }
@@ -64,7 +64,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationValidateResponse>
    */
-  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
+  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
     return this.beginValidate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationValidateResponse>;
   }
@@ -77,21 +77,21 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationGetSyncStateResponse>
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
+  getSyncState(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -109,9 +109,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Deploy Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -130,9 +130,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Save Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -151,9 +151,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Validate Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -167,8 +167,8 @@ export class TenantConfiguration {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getSyncStateOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getSyncStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/syncState",
   urlParameters: [
@@ -194,7 +194,7 @@ const getSyncStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeployOperationSpec: msRest.OperationSpec = {
+const beginDeployOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/deploy",
   urlParameters: [
@@ -228,7 +228,7 @@ const beginDeployOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginSaveOperationSpec: msRest.OperationSpec = {
+const beginSaveOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/save",
   urlParameters: [
@@ -262,7 +262,7 @@ const beginSaveOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginValidateOperationSpec: msRest.OperationSpec = {
+const beginValidateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/validate",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
index 43a8c279ccc7..3ea13cf17f4d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class User {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetResponse>;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
+  get(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class User {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,14 +269,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGenerateSsoUrlResponse>
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -306,7 +306,7 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetSharedAccessTokenResponse>
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -314,7 +314,7 @@ export class User {
    * @param parameters Create Authorization Token parameters.
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -323,8 +323,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserTokenResult>, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserTokenResult>, callback?: coreHttp.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -343,19 +343,19 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -367,8 +367,8 @@ export class User {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users",
   urlParameters: [
@@ -397,7 +397,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -423,7 +423,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -489,7 +489,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -521,7 +521,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -549,7 +549,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const generateSsoUrlOperationSpec: msRest.OperationSpec = {
+const generateSsoUrlOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl",
   urlParameters: [
@@ -575,7 +575,7 @@ const generateSsoUrlOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
+const getSharedAccessTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token",
   urlParameters: [
@@ -608,7 +608,7 @@ const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
index d9e3dbdaf146..a89f508bb26c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Mappers from "../models/userConfirmationPasswordMappers";
 import * as Parameters from "../models/parameters";
 import { ApiManagementClientContext } from "../apiManagementClientContext";
@@ -31,16 +31,16 @@ export class UserConfirmationPassword {
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,8 +48,8 @@ export class UserConfirmationPassword {
    * @param options The optional parameters
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  send(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,8 +63,8 @@ export class UserConfirmationPassword {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const sendOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const sendOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/confirmations/password/send",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
index 0387dbc52c58..2458f939727f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserGroup {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGroupListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/groups",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
index e84a1e21f620..292ac034ceb2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userIdentitiesMappers";
 import * as Parameters from "../models/parameters";
@@ -34,14 +34,14 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListResponse>
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserIdentities {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserIdentities {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/identities",
   urlParameters: [
@@ -119,7 +119,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
index bf8816577ff9..c75728d78f8f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userSubscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserSubscription {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserSubscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserSubscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserSubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserSubscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",

From cb1879d576a7069583384728267842eda8b775ed Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:02:57 +0000
Subject: [PATCH 20/24] Generated from 1f1421f9fdbf67ac8c1ac7f540346d3e98eef77e
 (#4431)

remove x-ms-odata
---
 sdk/apimanagement/arm-apimanagement/README.md |  10 +-
 .../arm-apimanagement/package.json            |  10 +-
 .../arm-apimanagement/rollup.config.js        |   8 +-
 .../src/apiManagementClient.ts                |   4 +-
 .../src/apiManagementClientContext.ts         |  12 +-
 .../arm-apimanagement/src/models/index.ts     | 810 ++++++++++--------
 .../arm-apimanagement/src/models/mappers.ts   | 588 ++++++-------
 .../src/models/parameters.ts                  | 144 ++--
 .../arm-apimanagement/src/operations/api.ts   |  92 +-
 .../src/operations/apiDiagnostic.ts           |  74 +-
 .../src/operations/apiExport.ts               |  14 +-
 .../src/operations/apiIssue.ts                |  72 +-
 .../src/operations/apiIssueAttachment.ts      |  62 +-
 .../src/operations/apiIssueComment.ts         |  62 +-
 .../src/operations/apiManagementOperations.ts |  24 +-
 .../src/operations/apiManagementService.ts    | 122 +--
 .../operations/apiManagementServiceSkus.ts    |  24 +-
 .../src/operations/apiOperation.ts            |  74 +-
 .../src/operations/apiOperationPolicy.ts      |  52 +-
 .../src/operations/apiPolicy.ts               |  52 +-
 .../src/operations/apiProduct.ts              |  22 +-
 .../src/operations/apiRelease.ts              |  74 +-
 .../src/operations/apiRevision.ts             |  22 +-
 .../src/operations/apiSchema.ts               |  62 +-
 .../src/operations/apiTagDescription.ts       |  62 +-
 .../src/operations/apiVersionSet.ts           |  74 +-
 .../src/operations/authorizationServer.ts     |  74 +-
 .../src/operations/backend.ts                 |  86 +-
 .../arm-apimanagement/src/operations/cache.ts |  74 +-
 .../src/operations/certificate.ts             |  62 +-
 .../src/operations/delegationSettings.ts      |  44 +-
 .../src/operations/diagnostic.ts              |  74 +-
 .../src/operations/emailTemplate.ts           |  74 +-
 .../arm-apimanagement/src/operations/group.ts |  74 +-
 .../src/operations/groupUser.ts               |  54 +-
 .../src/operations/identityProvider.ts        |  76 +-
 .../arm-apimanagement/src/operations/issue.ts |  32 +-
 .../src/operations/logger.ts                  |  74 +-
 .../src/operations/networkStatus.ts           |  24 +-
 .../src/operations/notification.ts            |  40 +-
 .../operations/notificationRecipientEmail.ts  |  46 +-
 .../operations/notificationRecipientUser.ts   |  46 +-
 .../src/operations/openIdConnectProvider.ts   |  74 +-
 .../src/operations/operationOperations.ts     |  22 +-
 .../src/operations/policy.ts                  |  52 +-
 .../src/operations/policySnippet.ts           |  12 +-
 .../src/operations/product.ts                 |  92 +-
 .../src/operations/productApi.ts              |  56 +-
 .../src/operations/productGroup.ts            |  56 +-
 .../src/operations/productPolicy.ts           |  52 +-
 .../src/operations/productSubscriptions.ts    |  22 +-
 .../src/operations/property.ts                |  74 +-
 .../src/operations/quotaByCounterKeys.ts      |  26 +-
 .../src/operations/quotaByPeriodKeys.ts       |  26 +-
 .../src/operations/region.ts                  |  24 +-
 .../src/operations/reports.ts                 | 138 +--
 .../src/operations/signInSettings.ts          |  44 +-
 .../src/operations/signUpSettings.ts          |  44 +-
 .../src/operations/subscription.ts            |  98 +--
 .../arm-apimanagement/src/operations/tag.ts   | 254 +++---
 .../src/operations/tagResource.ts             |  22 +-
 .../src/operations/tenantAccess.ts            |  60 +-
 .../src/operations/tenantAccessGit.ts         |  38 +-
 .../src/operations/tenantConfiguration.ts     |  40 +-
 .../arm-apimanagement/src/operations/user.ts  |  94 +-
 .../operations/userConfirmationPassword.ts    |  16 +-
 .../src/operations/userGroup.ts               |  22 +-
 .../src/operations/userIdentities.ts          |  24 +-
 .../src/operations/userSubscription.ts        |  22 +-
 69 files changed, 2567 insertions(+), 2517 deletions(-)

diff --git a/sdk/apimanagement/arm-apimanagement/README.md b/sdk/apimanagement/arm-apimanagement/README.md
index 862f3d10a47b..7abcc247b997 100644
--- a/sdk/apimanagement/arm-apimanagement/README.md
+++ b/sdk/apimanagement/arm-apimanagement/README.md
@@ -26,8 +26,8 @@ npm install @azure/ms-rest-nodeauth
 ##### Sample code
 
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
 import { ApiManagementClient, ApiManagementModels, ApiManagementMappers } from "@azure/arm-apimanagement";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
@@ -68,8 +68,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 <html lang="en">
   <head>
     <title>@azure/arm-apimanagement sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/@azure/core-http/dist/coreHttp.browser.js"></script>
+    <script src="node_modules/@azure/core-arm/dist/coreArm.js"></script>
     <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/arm-apimanagement/dist/arm-apimanagement.js"></script>
     <script type="text/javascript">
@@ -108,3 +108,5 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 ## Related projects
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/apimanagement/arm-apimanagement/README.png)
diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index 3dc6a1e94b14..b3a26bfc5de1 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -4,8 +4,8 @@
   "description": "ApiManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.8.1",
+    "@azure/core-arm": "^1.0.0-preview.1",
+    "@azure/core-http": "^1.0.0-preview.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -26,13 +26,13 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/apimanagement/arm-apimanagement",
   "repository": {
     "type": "git",
-    "url": "https://github.com/azure/azure-sdk-for-js.git"
+    "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
   "bugs": {
-    "url": "https://github.com/azure/azure-sdk-for-js/issues"
+    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
   },
   "files": [
     "dist/**/*.js",
diff --git a/sdk/apimanagement/arm-apimanagement/rollup.config.js b/sdk/apimanagement/arm-apimanagement/rollup.config.js
index dc0dc5622703..90edb8e8a3ff 100644
--- a/sdk/apimanagement/arm-apimanagement/rollup.config.js
+++ b/sdk/apimanagement/arm-apimanagement/rollup.config.js
@@ -8,8 +8,8 @@ import sourcemaps from "rollup-plugin-sourcemaps";
 const config = {
   input: "./esm/apiManagementClient.js",
   external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
+    "@azure/core-http",
+    "@azure/core-arm"
   ],
   output: {
     file: "./dist/arm-apimanagement.js",
@@ -17,8 +17,8 @@ const config = {
     name: "Azure.ArmApimanagement",
     sourcemap: true,
     globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
+      "@azure/core-http": "coreHttp",
+      "@azure/core-arm": "coreArm"
     },
     banner: `/*
  * Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
index 454cda6b424c..3a64af8ce303 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
@@ -86,7 +86,7 @@ class ApiManagementClient extends ApiManagementClientContext {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     super(credentials, subscriptionId, options);
     this.api = new operations.Api(this);
     this.apiRevision = new operations.ApiRevision(this);
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index 0a2d57d4bcfe..220b849ff8d9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -9,14 +9,14 @@
  */
 
 import * as Models from "./models";
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 
 const packageName = "@azure/arm-apimanagement";
 const packageVersion = "5.1.0";
 
-export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
-  credentials: msRest.ServiceClientCredentials;
+export class ApiManagementClientContext extends coreArm.AzureServiceClient {
+  credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials;
   apiVersion?: string;
   subscriptionId: string;
 
@@ -27,7 +27,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
@@ -39,7 +39,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
       options = {};
     }
     if(!options.userAgent) {
-      const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
+      const defaultUserAgent = coreArm.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index f91afeb3611d..27473a3b8b3e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -6,8 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export { BaseResource, CloudError };
 
@@ -2355,13 +2355,31 @@ export interface ApiManagementServiceBaseProperties {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2505,13 +2523,31 @@ export interface ApiManagementServiceResource extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2639,13 +2675,31 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -4407,7 +4461,7 @@ export interface QuotaCounterValueContract {
 /**
  * Optional Parameters.
  */
-export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4440,7 +4494,7 @@ export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4451,7 +4505,7 @@ export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete all revisions of the Api.
    */
@@ -4461,7 +4515,7 @@ export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase
 /**
  * Optional Parameters.
  */
-export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * | Field       | Supported operators    | Supported functions               |
    * |-------------|------------------------|-----------------------------------|
@@ -4492,7 +4546,7 @@ export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiBeginCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4503,7 +4557,7 @@ export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiRevisionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter |
@@ -4523,7 +4577,7 @@ export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le,
@@ -4543,7 +4597,7 @@ export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4554,7 +4608,7 @@ export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4583,7 +4637,7 @@ export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4594,7 +4648,7 @@ export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4604,7 +4658,7 @@ export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4615,7 +4669,7 @@ export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface TagListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4636,7 +4690,7 @@ export interface TagListByOperationOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4657,7 +4711,7 @@ export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface TagListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4678,7 +4732,7 @@ export interface TagListByProductOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4703,7 +4757,7 @@ export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface TagCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4714,7 +4768,7 @@ export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiProductListByApisOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiProductListByApisOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4734,7 +4788,7 @@ export interface ApiProductListByApisOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4744,7 +4798,7 @@ export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4755,7 +4809,7 @@ export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter |
@@ -4775,7 +4829,7 @@ export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4786,7 +4840,7 @@ export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * If true removes all references to the schema before deleting it.
    */
@@ -4796,7 +4850,7 @@ export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4816,7 +4870,7 @@ export interface ApiDiagnosticListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4827,7 +4881,7 @@ export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4853,7 +4907,7 @@ export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Expand the comment attachments.
    */
@@ -4863,7 +4917,7 @@ export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4874,7 +4928,7 @@ export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4895,7 +4949,7 @@ export interface ApiIssueCommentListByServiceOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4906,7 +4960,7 @@ export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.Requ
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4927,7 +4981,7 @@ export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4938,7 +4992,7 @@ export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4959,7 +5013,7 @@ export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4970,7 +5024,7 @@ export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface OperationListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface OperationListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5000,7 +5054,7 @@ export interface OperationListByTagsOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>
@@ -5019,7 +5073,7 @@ export interface ApiVersionSetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5030,7 +5084,7 @@ export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5051,7 +5105,7 @@ export interface AuthorizationServerListByServiceOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5062,7 +5116,7 @@ export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.
 /**
  * Optional Parameters.
  */
-export interface BackendListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5084,7 +5138,7 @@ export interface BackendListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5095,7 +5149,7 @@ export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendReconnectOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Reconnect request parameters.
    */
@@ -5105,7 +5159,7 @@ export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5119,7 +5173,7 @@ export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5130,7 +5184,7 @@ export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface CertificateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5153,7 +5207,7 @@ export interface CertificateListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5164,7 +5218,7 @@ export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5176,7 +5230,7 @@ export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalPar
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5188,7 +5242,7 @@ export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOption
 /**
  * Optional Parameters.
  */
-export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5208,7 +5262,7 @@ export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5219,7 +5273,7 @@ export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5239,7 +5293,7 @@ export interface EmailTemplateListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5250,7 +5304,7 @@ export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5273,7 +5327,7 @@ export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5284,7 +5338,7 @@ export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupUserListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5309,7 +5363,7 @@ export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface IdentityProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5320,7 +5374,7 @@ export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface IssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5345,7 +5399,7 @@ export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface LoggerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5368,7 +5422,7 @@ export interface LoggerListByServiceOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5379,7 +5433,7 @@ export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Force deletion even if diagnostic is attached.
    */
@@ -5389,7 +5443,7 @@ export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface NotificationListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5403,7 +5457,7 @@ export interface NotificationListByServiceOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface NotificationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5414,7 +5468,7 @@ export interface NotificationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5435,7 +5489,7 @@ export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5446,7 +5500,7 @@ export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRes
 /**
  * Optional Parameters.
  */
-export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5456,7 +5510,7 @@ export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5467,7 +5521,7 @@ export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface PolicySnippetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicySnippetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy scope. Possible values include: 'Tenant', 'Product', 'Api', 'Operation', 'All'
    */
@@ -5477,7 +5531,7 @@ export interface PolicySnippetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignInSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5488,7 +5542,7 @@ export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignUpSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5499,7 +5553,7 @@ export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DelegationSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5510,7 +5564,7 @@ export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ProductListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5543,7 +5597,7 @@ export interface ProductListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5554,7 +5608,7 @@ export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete existing subscriptions associated with the product or not.
    */
@@ -5564,7 +5618,7 @@ export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5592,7 +5646,7 @@ export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ProductApiListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductApiListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5617,7 +5671,7 @@ export interface ProductApiListByProductOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ProductGroupListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductGroupListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5638,7 +5692,7 @@ export interface ProductGroupListByProductOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductSubscriptionsListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5665,7 +5719,7 @@ export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5675,7 +5729,7 @@ export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5686,7 +5740,7 @@ export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface PropertyListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le,
@@ -5707,7 +5761,7 @@ export interface PropertyListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5718,7 +5772,7 @@ export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5736,7 +5790,7 @@ export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByUserOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5754,7 +5808,7 @@ export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5772,7 +5826,7 @@ export interface ReportsListByOperationOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5790,7 +5844,7 @@ export interface ReportsListByProductOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByGeoOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5804,7 +5858,7 @@ export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListBySubscriptionOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5822,7 +5876,7 @@ export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByTimeOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5840,7 +5894,7 @@ export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByRequestOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByRequestOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5854,7 +5908,7 @@ export interface ReportsListByRequestOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5881,7 +5935,7 @@ export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5898,7 +5952,7 @@ export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5910,7 +5964,7 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagResourceListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagResourceListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le,
@@ -5942,7 +5996,7 @@ export interface TagResourceListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface UserListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5972,7 +6026,7 @@ export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface UserCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5983,7 +6037,7 @@ export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface UserDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Whether to delete user's subscription or not.
    */
@@ -5997,7 +6051,7 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserGroupListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -6019,7 +6073,7 @@ export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface UserSubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserSubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -7943,7 +7997,7 @@ export type ApiListByServiceResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -7963,7 +8017,7 @@ export type ApiGetEntityTagResponse = ApiGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -7978,7 +8032,7 @@ export type ApiGetResponse = ApiContract & ApiGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8003,7 +8057,7 @@ export type ApiCreateOrUpdateResponse = ApiContract & ApiCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8028,7 +8082,7 @@ export type ApiListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8048,7 +8102,7 @@ export type ApiListByServiceNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8068,7 +8122,7 @@ export type ApiListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8088,7 +8142,7 @@ export type ApiRevisionListByServiceResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8108,7 +8162,7 @@ export type ApiRevisionListByServiceNextResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8128,7 +8182,7 @@ export type ApiReleaseListByServiceResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8148,7 +8202,7 @@ export type ApiReleaseGetEntityTagResponse = ApiReleaseGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8163,7 +8217,7 @@ export type ApiReleaseGetResponse = ApiReleaseContract & ApiReleaseGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8188,7 +8242,7 @@ export type ApiReleaseCreateOrUpdateResponse = ApiReleaseContract & ApiReleaseCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8213,7 +8267,7 @@ export type ApiReleaseListByServiceNextResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8233,7 +8287,7 @@ export type ApiOperationListByApiResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8253,7 +8307,7 @@ export type ApiOperationGetEntityTagResponse = ApiOperationGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8268,7 +8322,7 @@ export type ApiOperationGetResponse = OperationContract & ApiOperationGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8293,7 +8347,7 @@ export type ApiOperationCreateOrUpdateResponse = OperationContract & ApiOperatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8318,7 +8372,7 @@ export type ApiOperationListByApiNextResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8338,7 +8392,7 @@ export type ApiOperationPolicyListByOperationResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8358,7 +8412,7 @@ export type ApiOperationPolicyGetEntityTagResponse = ApiOperationPolicyGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8373,7 +8427,7 @@ export type ApiOperationPolicyGetResponse = PolicyContract & ApiOperationPolicyG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8398,7 +8452,7 @@ export type ApiOperationPolicyCreateOrUpdateResponse = PolicyContract & ApiOpera
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8423,7 +8477,7 @@ export type TagListByOperationResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8443,7 +8497,7 @@ export type TagGetEntityStateByOperationResponse = TagGetEntityStateByOperationH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8458,7 +8512,7 @@ export type TagGetByOperationResponse = TagContract & TagGetByOperationHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8483,7 +8537,7 @@ export type TagAssignToOperationResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8503,7 +8557,7 @@ export type TagListByApiResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8523,7 +8577,7 @@ export type TagGetEntityStateByApiResponse = TagGetEntityStateByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8538,7 +8592,7 @@ export type TagGetByApiResponse = TagContract & TagGetByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8563,7 +8617,7 @@ export type TagAssignToApiResponse = TagContract & TagAssignToApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8588,7 +8642,7 @@ export type TagListByProductResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8608,7 +8662,7 @@ export type TagGetEntityStateByProductResponse = TagGetEntityStateByProductHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8623,7 +8677,7 @@ export type TagGetByProductResponse = TagContract & TagGetByProductHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8648,7 +8702,7 @@ export type TagAssignToProductResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8668,7 +8722,7 @@ export type TagListByServiceResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8688,7 +8742,7 @@ export type TagGetEntityStateResponse = TagGetEntityStateHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8703,7 +8757,7 @@ export type TagGetResponse = TagContract & TagGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8728,7 +8782,7 @@ export type TagCreateOrUpdateResponse = TagContract & TagCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8753,7 +8807,7 @@ export type TagListByOperationNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8773,7 +8827,7 @@ export type TagListByApiNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8793,7 +8847,7 @@ export type TagListByProductNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8813,7 +8867,7 @@ export type TagListByServiceNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8833,7 +8887,7 @@ export type ApiProductListByApisResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8853,7 +8907,7 @@ export type ApiProductListByApisNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8873,7 +8927,7 @@ export type ApiPolicyListByApiResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8893,7 +8947,7 @@ export type ApiPolicyGetEntityTagResponse = ApiPolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8908,7 +8962,7 @@ export type ApiPolicyGetResponse = PolicyContract & ApiPolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8933,7 +8987,7 @@ export type ApiPolicyCreateOrUpdateResponse = PolicyContract & ApiPolicyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8958,7 +9012,7 @@ export type ApiSchemaListByApiResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8978,7 +9032,7 @@ export type ApiSchemaGetEntityTagResponse = ApiSchemaGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8993,7 +9047,7 @@ export type ApiSchemaGetResponse = SchemaContract & ApiSchemaGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9018,7 +9072,7 @@ export type ApiSchemaCreateOrUpdateResponse = SchemaContract & ApiSchemaCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9043,7 +9097,7 @@ export type ApiSchemaListByApiNextResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9063,7 +9117,7 @@ export type ApiDiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9083,7 +9137,7 @@ export type ApiDiagnosticGetEntityTagResponse = ApiDiagnosticGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9098,7 +9152,7 @@ export type ApiDiagnosticGetResponse = DiagnosticContract & ApiDiagnosticGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9123,7 +9177,7 @@ export type ApiDiagnosticCreateOrUpdateResponse = DiagnosticContract & ApiDiagno
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9148,7 +9202,7 @@ export type ApiDiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9168,7 +9222,7 @@ export type ApiIssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9188,7 +9242,7 @@ export type ApiIssueGetEntityTagResponse = ApiIssueGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9203,7 +9257,7 @@ export type ApiIssueGetResponse = IssueContract & ApiIssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9228,7 +9282,7 @@ export type ApiIssueCreateOrUpdateResponse = IssueContract & ApiIssueCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9253,7 +9307,7 @@ export type ApiIssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9273,7 +9327,7 @@ export type ApiIssueCommentListByServiceResponse = IssueCommentCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9293,7 +9347,7 @@ export type ApiIssueCommentGetEntityTagResponse = ApiIssueCommentGetEntityTagHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9308,7 +9362,7 @@ export type ApiIssueCommentGetResponse = IssueCommentContract & ApiIssueCommentG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9333,7 +9387,7 @@ export type ApiIssueCommentCreateOrUpdateResponse = IssueCommentContract & ApiIs
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9358,7 +9412,7 @@ export type ApiIssueCommentListByServiceNextResponse = IssueCommentCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9378,7 +9432,7 @@ export type ApiIssueAttachmentListByServiceResponse = IssueAttachmentCollection
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9398,7 +9452,7 @@ export type ApiIssueAttachmentGetEntityTagResponse = ApiIssueAttachmentGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9413,7 +9467,7 @@ export type ApiIssueAttachmentGetResponse = IssueAttachmentContract & ApiIssueAt
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9438,7 +9492,7 @@ export type ApiIssueAttachmentCreateOrUpdateResponse = IssueAttachmentContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9463,7 +9517,7 @@ export type ApiIssueAttachmentListByServiceNextResponse = IssueAttachmentCollect
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9483,7 +9537,7 @@ export type ApiTagDescriptionListByServiceResponse = TagDescriptionCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9503,7 +9557,7 @@ export type ApiTagDescriptionGetEntityTagResponse = ApiTagDescriptionGetEntityTa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9518,7 +9572,7 @@ export type ApiTagDescriptionGetResponse = TagDescriptionContract & ApiTagDescri
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9543,7 +9597,7 @@ export type ApiTagDescriptionCreateOrUpdateResponse = TagDescriptionContract & A
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9568,7 +9622,7 @@ export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollectio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9588,7 +9642,7 @@ export type OperationListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9608,7 +9662,7 @@ export type OperationListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9628,7 +9682,7 @@ export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9648,7 +9702,7 @@ export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9663,7 +9717,7 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9688,7 +9742,7 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9713,7 +9767,7 @@ export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9733,7 +9787,7 @@ export type AuthorizationServerListByServiceResponse = AuthorizationServerCollec
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9753,7 +9807,7 @@ export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEnti
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9768,7 +9822,7 @@ export type AuthorizationServerGetResponse = AuthorizationServerContract & Autho
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9793,7 +9847,7 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9818,7 +9872,7 @@ export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9838,7 +9892,7 @@ export type BackendListByServiceResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9858,7 +9912,7 @@ export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9873,7 +9927,7 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9898,7 +9952,7 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9923,7 +9977,7 @@ export type BackendListByServiceNextResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9943,7 +9997,7 @@ export type CacheListByServiceResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9963,7 +10017,7 @@ export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9978,7 +10032,7 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10003,7 +10057,7 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10028,7 +10082,7 @@ export type CacheListByServiceNextResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10048,7 +10102,7 @@ export type CertificateListByServiceResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10068,7 +10122,7 @@ export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10083,7 +10137,7 @@ export type CertificateGetResponse = CertificateContract & CertificateGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10108,7 +10162,7 @@ export type CertificateCreateOrUpdateResponse = CertificateContract & Certificat
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10133,7 +10187,7 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10153,7 +10207,7 @@ export type ApiManagementOperationsListResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10173,7 +10227,7 @@ export type ApiManagementOperationsListNextResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10193,7 +10247,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusResponse = ResourceS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10213,7 +10267,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusNextResponse = Resou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10233,7 +10287,7 @@ export type ApiManagementServiceRestoreResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10253,7 +10307,7 @@ export type ApiManagementServiceBackupResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10273,7 +10327,7 @@ export type ApiManagementServiceCreateOrUpdateResponse = ApiManagementServiceRes
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10293,7 +10347,7 @@ export type ApiManagementServiceUpdateResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10313,7 +10367,7 @@ export type ApiManagementServiceGetResponse = ApiManagementServiceResource & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10333,7 +10387,7 @@ export type ApiManagementServiceDeleteMethodResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10353,7 +10407,7 @@ export type ApiManagementServiceListByResourceGroupResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10373,7 +10427,7 @@ export type ApiManagementServiceListResponse = ApiManagementServiceListResult &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10393,7 +10447,7 @@ export type ApiManagementServiceGetSsoTokenResponse = ApiManagementServiceGetSso
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10413,7 +10467,7 @@ export type ApiManagementServiceCheckNameAvailabilityResponse = ApiManagementSer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10433,7 +10487,7 @@ export type ApiManagementServiceApplyNetworkConfigurationUpdatesResponse = ApiMa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10453,7 +10507,7 @@ export type ApiManagementServiceBeginRestoreResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10473,7 +10527,7 @@ export type ApiManagementServiceBeginBackupResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10493,7 +10547,7 @@ export type ApiManagementServiceBeginCreateOrUpdateResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10513,7 +10567,7 @@ export type ApiManagementServiceBeginUpdateResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10533,7 +10587,7 @@ export type ApiManagementServiceBeginDeleteMethodResponse = ApiManagementService
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10553,7 +10607,7 @@ export type ApiManagementServiceBeginApplyNetworkConfigurationUpdatesResponse =
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10573,7 +10627,7 @@ export type ApiManagementServiceListByResourceGroupNextResponse = ApiManagementS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10593,7 +10647,7 @@ export type ApiManagementServiceListNextResponse = ApiManagementServiceListResul
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10613,7 +10667,7 @@ export type DiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10633,7 +10687,7 @@ export type DiagnosticGetEntityTagResponse = DiagnosticGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10648,7 +10702,7 @@ export type DiagnosticGetResponse = DiagnosticContract & DiagnosticGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10673,7 +10727,7 @@ export type DiagnosticCreateOrUpdateResponse = DiagnosticContract & DiagnosticCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10698,7 +10752,7 @@ export type DiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10718,7 +10772,7 @@ export type EmailTemplateListByServiceResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10738,7 +10792,7 @@ export type EmailTemplateGetEntityTagResponse = EmailTemplateGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10753,7 +10807,7 @@ export type EmailTemplateGetResponse = EmailTemplateContract & EmailTemplateGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10778,7 +10832,7 @@ export type EmailTemplateCreateOrUpdateResponse = EmailTemplateContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10798,7 +10852,7 @@ export type EmailTemplateListByServiceNextResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10818,7 +10872,7 @@ export type GroupListByServiceResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10838,7 +10892,7 @@ export type GroupGetEntityTagResponse = GroupGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10853,7 +10907,7 @@ export type GroupGetResponse = GroupContract & GroupGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10878,7 +10932,7 @@ export type GroupCreateOrUpdateResponse = GroupContract & GroupCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10903,7 +10957,7 @@ export type GroupListByServiceNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10923,7 +10977,7 @@ export type GroupUserListResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10948,7 +11002,7 @@ export type GroupUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10968,7 +11022,7 @@ export type GroupUserCreateResponse = UserContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10988,7 +11042,7 @@ export type GroupUserListNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11008,7 +11062,7 @@ export type IdentityProviderListByServiceResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11028,7 +11082,7 @@ export type IdentityProviderGetEntityTagResponse = IdentityProviderGetEntityTagH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11043,7 +11097,7 @@ export type IdentityProviderGetResponse = IdentityProviderContract & IdentityPro
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11068,7 +11122,7 @@ export type IdentityProviderCreateOrUpdateResponse = IdentityProviderContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11093,7 +11147,7 @@ export type IdentityProviderListByServiceNextResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11113,7 +11167,7 @@ export type IssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11133,7 +11187,7 @@ export type IssueGetResponse = IssueContract & IssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11158,7 +11212,7 @@ export type IssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11178,7 +11232,7 @@ export type LoggerListByServiceResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11198,7 +11252,7 @@ export type LoggerGetEntityTagResponse = LoggerGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11213,7 +11267,7 @@ export type LoggerGetResponse = LoggerContract & LoggerGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11238,7 +11292,7 @@ export type LoggerCreateOrUpdateResponse = LoggerContract & LoggerCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11263,7 +11317,7 @@ export type LoggerListByServiceNextResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11283,7 +11337,7 @@ export type NetworkStatusListByServiceResponse = Array<NetworkStatusContractByLo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11303,7 +11357,7 @@ export type NetworkStatusListByLocationResponse = NetworkStatusContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11323,7 +11377,7 @@ export type NotificationListByServiceResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11343,7 +11397,7 @@ export type NotificationGetResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11363,7 +11417,7 @@ export type NotificationCreateOrUpdateResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11383,7 +11437,7 @@ export type NotificationListByServiceNextResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11403,7 +11457,7 @@ export type NotificationRecipientUserListByNotificationResponse = RecipientUserC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11428,7 +11482,7 @@ export type NotificationRecipientUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11448,7 +11502,7 @@ export type NotificationRecipientUserCreateOrUpdateResponse = RecipientUserContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11468,7 +11522,7 @@ export type NotificationRecipientEmailListByNotificationResponse = RecipientEmai
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11493,7 +11547,7 @@ export type NotificationRecipientEmailCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11513,7 +11567,7 @@ export type NotificationRecipientEmailCreateOrUpdateResponse = RecipientEmailCon
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11533,7 +11587,7 @@ export type OpenIdConnectProviderListByServiceResponse = OpenIdConnectProviderCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11553,7 +11607,7 @@ export type OpenIdConnectProviderGetEntityTagResponse = OpenIdConnectProviderGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11568,7 +11622,7 @@ export type OpenIdConnectProviderGetResponse = OpenidConnectProviderContract & O
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11593,7 +11647,7 @@ export type OpenIdConnectProviderCreateOrUpdateResponse = OpenidConnectProviderC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11618,7 +11672,7 @@ export type OpenIdConnectProviderListByServiceNextResponse = OpenIdConnectProvid
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11638,7 +11692,7 @@ export type PolicyListByServiceResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11658,7 +11712,7 @@ export type PolicyGetEntityTagResponse = PolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11673,7 +11727,7 @@ export type PolicyGetResponse = PolicyContract & PolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11698,7 +11752,7 @@ export type PolicyCreateOrUpdateResponse = PolicyContract & PolicyCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11723,7 +11777,7 @@ export type PolicySnippetListByServiceResponse = PolicySnippetsCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11743,7 +11797,7 @@ export type SignInSettingsGetEntityTagResponse = SignInSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11758,7 +11812,7 @@ export type SignInSettingsGetResponse = PortalSigninSettings & SignInSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11783,7 +11837,7 @@ export type SignInSettingsCreateOrUpdateResponse = PortalSigninSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11803,7 +11857,7 @@ export type SignUpSettingsGetEntityTagResponse = SignUpSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11818,7 +11872,7 @@ export type SignUpSettingsGetResponse = PortalSignupSettings & SignUpSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11843,7 +11897,7 @@ export type SignUpSettingsCreateOrUpdateResponse = PortalSignupSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11863,7 +11917,7 @@ export type DelegationSettingsGetEntityTagResponse = DelegationSettingsGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11878,7 +11932,7 @@ export type DelegationSettingsGetResponse = PortalDelegationSettings & Delegatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11903,7 +11957,7 @@ export type DelegationSettingsCreateOrUpdateResponse = PortalDelegationSettings
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11923,7 +11977,7 @@ export type ProductListByServiceResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11943,7 +11997,7 @@ export type ProductGetEntityTagResponse = ProductGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11958,7 +12012,7 @@ export type ProductGetResponse = ProductContract & ProductGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11983,7 +12037,7 @@ export type ProductCreateOrUpdateResponse = ProductContract & ProductCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12008,7 +12062,7 @@ export type ProductListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12028,7 +12082,7 @@ export type ProductListByServiceNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12048,7 +12102,7 @@ export type ProductListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12068,7 +12122,7 @@ export type ProductApiListByProductResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12088,7 +12142,7 @@ export type ProductApiCreateOrUpdateResponse = ApiContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12108,7 +12162,7 @@ export type ProductApiListByProductNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12128,7 +12182,7 @@ export type ProductGroupListByProductResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12148,7 +12202,7 @@ export type ProductGroupCreateOrUpdateResponse = GroupContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12168,7 +12222,7 @@ export type ProductGroupListByProductNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12188,7 +12242,7 @@ export type ProductSubscriptionsListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12208,7 +12262,7 @@ export type ProductSubscriptionsListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12228,7 +12282,7 @@ export type ProductPolicyListByProductResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12248,7 +12302,7 @@ export type ProductPolicyGetEntityTagResponse = ProductPolicyGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12263,7 +12317,7 @@ export type ProductPolicyGetResponse = PolicyContract & ProductPolicyGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12288,7 +12342,7 @@ export type ProductPolicyCreateOrUpdateResponse = PolicyContract & ProductPolicy
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12313,7 +12367,7 @@ export type PropertyListByServiceResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12333,7 +12387,7 @@ export type PropertyGetEntityTagResponse = PropertyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12348,7 +12402,7 @@ export type PropertyGetResponse = PropertyContract & PropertyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12373,7 +12427,7 @@ export type PropertyCreateOrUpdateResponse = PropertyContract & PropertyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12398,7 +12452,7 @@ export type PropertyListByServiceNextResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12418,7 +12472,7 @@ export type QuotaByCounterKeysListByServiceResponse = QuotaCounterCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12438,7 +12492,7 @@ export type QuotaByPeriodKeysGetResponse = QuotaCounterContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12458,7 +12512,7 @@ export type RegionListByServiceResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12478,7 +12532,7 @@ export type RegionListByServiceNextResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12498,7 +12552,7 @@ export type ReportsListByApiResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12518,7 +12572,7 @@ export type ReportsListByUserResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12538,7 +12592,7 @@ export type ReportsListByOperationResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12558,7 +12612,7 @@ export type ReportsListByProductResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12578,7 +12632,7 @@ export type ReportsListByGeoResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12598,7 +12652,7 @@ export type ReportsListBySubscriptionResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12618,7 +12672,7 @@ export type ReportsListByTimeResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12638,7 +12692,7 @@ export type ReportsListByRequestResponse = RequestReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12658,7 +12712,7 @@ export type ReportsListByApiNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12678,7 +12732,7 @@ export type ReportsListByUserNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12698,7 +12752,7 @@ export type ReportsListByOperationNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12718,7 +12772,7 @@ export type ReportsListByProductNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12738,7 +12792,7 @@ export type ReportsListByGeoNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12758,7 +12812,7 @@ export type ReportsListBySubscriptionNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12778,7 +12832,7 @@ export type ReportsListByTimeNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12798,7 +12852,7 @@ export type SubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12818,7 +12872,7 @@ export type SubscriptionGetEntityTagResponse = SubscriptionGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12833,7 +12887,7 @@ export type SubscriptionGetResponse = SubscriptionContract & SubscriptionGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12858,7 +12912,7 @@ export type SubscriptionCreateOrUpdateResponse = SubscriptionContract & Subscrip
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12883,7 +12937,7 @@ export type SubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12903,7 +12957,7 @@ export type TagResourceListByServiceResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12923,7 +12977,7 @@ export type TagResourceListByServiceNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12943,7 +12997,7 @@ export type TenantAccessGetEntityTagResponse = TenantAccessGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12958,7 +13012,7 @@ export type TenantAccessGetResponse = AccessInformationContract & TenantAccessGe
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12983,7 +13037,7 @@ export type TenantAccessGitGetResponse = AccessInformationContract & TenantAcces
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13008,7 +13062,7 @@ export type TenantConfigurationDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13028,7 +13082,7 @@ export type TenantConfigurationSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13048,7 +13102,7 @@ export type TenantConfigurationValidateResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13068,7 +13122,7 @@ export type TenantConfigurationGetSyncStateResponse = TenantConfigurationSyncSta
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13088,7 +13142,7 @@ export type TenantConfigurationBeginDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13108,7 +13162,7 @@ export type TenantConfigurationBeginSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13128,7 +13182,7 @@ export type TenantConfigurationBeginValidateResponse = OperationResultContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13148,7 +13202,7 @@ export type UserListByServiceResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13168,7 +13222,7 @@ export type UserGetEntityTagResponse = UserGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13183,7 +13237,7 @@ export type UserGetResponse = UserContract & UserGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13208,7 +13262,7 @@ export type UserCreateOrUpdateResponse = UserContract & UserCreateOrUpdateHeader
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13233,7 +13287,7 @@ export type UserGenerateSsoUrlResponse = GenerateSsoUrlResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13253,7 +13307,7 @@ export type UserGetSharedAccessTokenResponse = UserTokenResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13273,7 +13327,7 @@ export type UserListByServiceNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13293,7 +13347,7 @@ export type UserGroupListResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13313,7 +13367,7 @@ export type UserGroupListNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13333,7 +13387,7 @@ export type UserSubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13353,7 +13407,7 @@ export type UserSubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13373,7 +13427,7 @@ export type UserIdentitiesListResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13393,7 +13447,7 @@ export type UserIdentitiesListNextResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13413,7 +13467,7 @@ export type ApiExportGetResponse = ApiExportResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 6b65ce34b85f..60dd6c440a4f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -6,13 +6,13 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { CloudErrorMapper, BaseResourceMapper } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
 
-export const ErrorFieldContract: msRest.CompositeMapper = {
+export const ErrorFieldContract: coreHttp.CompositeMapper = {
   serializedName: "ErrorFieldContract",
   type: {
     name: "Composite",
@@ -40,7 +40,7 @@ export const ErrorFieldContract: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponseBody: msRest.CompositeMapper = {
+export const ErrorResponseBody: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponseBody",
   type: {
     name: "Composite",
@@ -74,7 +74,7 @@ export const ErrorResponseBody: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponse: msRest.CompositeMapper = {
+export const ErrorResponse: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponse",
   type: {
     name: "Composite",
@@ -108,7 +108,7 @@ export const ErrorResponse: msRest.CompositeMapper = {
   }
 };
 
-export const RegionContract: msRest.CompositeMapper = {
+export const RegionContract: coreHttp.CompositeMapper = {
   serializedName: "RegionContract",
   type: {
     name: "Composite",
@@ -137,7 +137,7 @@ export const RegionContract: msRest.CompositeMapper = {
   }
 };
 
-export const Resource: msRest.CompositeMapper = {
+export const Resource: coreHttp.CompositeMapper = {
   serializedName: "Resource",
   type: {
     name: "Composite",
@@ -168,7 +168,7 @@ export const Resource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResultValue: msRest.CompositeMapper = {
+export const ApiExportResultValue: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult_value",
   type: {
     name: "Composite",
@@ -184,7 +184,7 @@ export const ApiExportResultValue: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResult: msRest.CompositeMapper = {
+export const ApiExportResult: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult",
   type: {
     name: "Composite",
@@ -213,7 +213,7 @@ export const ApiExportResult: msRest.CompositeMapper = {
   }
 };
 
-export const ProductEntityBaseParameters: msRest.CompositeMapper = {
+export const ProductEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductEntityBaseParameters",
   type: {
     name: "Composite",
@@ -267,7 +267,7 @@ export const ProductEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
+export const ProductTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ProductTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -295,7 +295,7 @@ export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
+export const OperationTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "OperationTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -360,7 +360,7 @@ export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
+export const SubscriptionKeyParameterNamesContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionKeyParameterNamesContract",
   type: {
     name: "Composite",
@@ -382,7 +382,7 @@ export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OpenIdAuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OpenIdAuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -409,7 +409,7 @@ export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OAuth2AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OAuth2AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -431,7 +431,7 @@ export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -461,7 +461,7 @@ export const AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
+export const ApiVersionSetContractDetails: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContractDetails",
   type: {
     name: "Composite",
@@ -507,7 +507,7 @@ export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
+export const ApiCreateOrUpdatePropertiesWsdlSelector: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateProperties_wsdlSelector",
   type: {
     name: "Composite",
@@ -529,7 +529,7 @@ export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
   }
 };
 
-export const ApiEntityBaseContract: msRest.CompositeMapper = {
+export const ApiEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiEntityBaseContract",
   type: {
     name: "Composite",
@@ -627,7 +627,7 @@ export const ApiEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContractProperties: msRest.CompositeMapper = {
+export const ApiContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiContractProperties",
   type: {
     name: "Composite",
@@ -697,7 +697,7 @@ export const ApiContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
+export const ApiTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -759,7 +759,7 @@ export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagTagResourceContractProperties: msRest.CompositeMapper = {
+export const TagTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "TagTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -785,7 +785,7 @@ export const TagTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceContract: msRest.CompositeMapper = {
+export const TagResourceContract: coreHttp.CompositeMapper = {
   serializedName: "TagResourceContract",
   type: {
     name: "Composite",
@@ -824,7 +824,7 @@ export const TagResourceContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagContract: msRest.CompositeMapper = {
+export const TagContract: coreHttp.CompositeMapper = {
   serializedName: "TagContract",
   type: {
     name: "Composite",
@@ -846,7 +846,7 @@ export const TagContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionContract: msRest.CompositeMapper = {
+export const TagDescriptionContract: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionContract",
   type: {
     name: "Composite",
@@ -888,7 +888,7 @@ export const TagDescriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
+export const TagDescriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCreateParameters",
   type: {
     name: "Composite",
@@ -919,7 +919,7 @@ export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentContract: msRest.CompositeMapper = {
+export const IssueAttachmentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentContract",
   type: {
     name: "Composite",
@@ -951,7 +951,7 @@ export const IssueAttachmentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentContract: msRest.CompositeMapper = {
+export const IssueCommentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentContract",
   type: {
     name: "Composite",
@@ -982,7 +982,7 @@ export const IssueCommentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContractBaseProperties: msRest.CompositeMapper = {
+export const IssueContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "IssueContractBaseProperties",
   type: {
     name: "Composite",
@@ -1010,7 +1010,7 @@ export const IssueContractBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const IssueUpdateContract: msRest.CompositeMapper = {
+export const IssueUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "IssueUpdateContract",
   type: {
     name: "Composite",
@@ -1056,7 +1056,7 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContract: msRest.CompositeMapper = {
+export const IssueContract: coreHttp.CompositeMapper = {
   serializedName: "IssueContract",
   type: {
     name: "Composite",
@@ -1106,7 +1106,7 @@ export const IssueContract: msRest.CompositeMapper = {
   }
 };
 
-export const BodyDiagnosticSettings: msRest.CompositeMapper = {
+export const BodyDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "BodyDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1125,7 +1125,7 @@ export const BodyDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const HttpMessageDiagnostic: msRest.CompositeMapper = {
+export const HttpMessageDiagnostic: coreHttp.CompositeMapper = {
   serializedName: "HttpMessageDiagnostic",
   type: {
     name: "Composite",
@@ -1153,7 +1153,7 @@ export const HttpMessageDiagnostic: msRest.CompositeMapper = {
   }
 };
 
-export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
+export const PipelineDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "PipelineDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1177,7 +1177,7 @@ export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SamplingSettings: msRest.CompositeMapper = {
+export const SamplingSettings: coreHttp.CompositeMapper = {
   serializedName: "SamplingSettings",
   type: {
     name: "Composite",
@@ -1203,7 +1203,7 @@ export const SamplingSettings: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticContract: msRest.CompositeMapper = {
+export const DiagnosticContract: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticContract",
   type: {
     name: "Composite",
@@ -1254,7 +1254,7 @@ export const DiagnosticContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaContract: msRest.CompositeMapper = {
+export const SchemaContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaContract",
   type: {
     name: "Composite",
@@ -1278,7 +1278,7 @@ export const SchemaContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
+export const SchemaCreateOrUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaCreateOrUpdateContract",
   type: {
     name: "Composite",
@@ -1302,7 +1302,7 @@ export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyContract: msRest.CompositeMapper = {
+export const PolicyContract: coreHttp.CompositeMapper = {
   serializedName: "PolicyContract",
   type: {
     name: "Composite",
@@ -1327,7 +1327,7 @@ export const PolicyContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCollection: msRest.CompositeMapper = {
+export const PolicyCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicyCollection",
   type: {
     name: "Composite",
@@ -1355,7 +1355,7 @@ export const PolicyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductContract: msRest.CompositeMapper = {
+export const ProductContract: coreHttp.CompositeMapper = {
   serializedName: "ProductContract",
   type: {
     name: "Composite",
@@ -1421,7 +1421,7 @@ export const ProductContract: msRest.CompositeMapper = {
   }
 };
 
-export const ParameterContract: msRest.CompositeMapper = {
+export const ParameterContract: coreHttp.CompositeMapper = {
   serializedName: "ParameterContract",
   type: {
     name: "Composite",
@@ -1474,7 +1474,7 @@ export const ParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const RepresentationContract: msRest.CompositeMapper = {
+export const RepresentationContract: coreHttp.CompositeMapper = {
   serializedName: "RepresentationContract",
   type: {
     name: "Composite",
@@ -1521,7 +1521,7 @@ export const RepresentationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResponseContract: msRest.CompositeMapper = {
+export const ResponseContract: coreHttp.CompositeMapper = {
   serializedName: "ResponseContract",
   type: {
     name: "Composite",
@@ -1568,7 +1568,7 @@ export const ResponseContract: msRest.CompositeMapper = {
   }
 };
 
-export const RequestContract: msRest.CompositeMapper = {
+export const RequestContract: coreHttp.CompositeMapper = {
   serializedName: "RequestContract",
   type: {
     name: "Composite",
@@ -1620,7 +1620,7 @@ export const RequestContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationEntityBaseContract: msRest.CompositeMapper = {
+export const OperationEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "OperationEntityBaseContract",
   type: {
     name: "Composite",
@@ -1676,7 +1676,7 @@ export const OperationEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationUpdateContract: msRest.CompositeMapper = {
+export const OperationUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OperationUpdateContract",
   type: {
     name: "Composite",
@@ -1758,7 +1758,7 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationContract: msRest.CompositeMapper = {
+export const OperationContract: coreHttp.CompositeMapper = {
   serializedName: "OperationContract",
   type: {
     name: "Composite",
@@ -1844,7 +1844,7 @@ export const OperationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseContract: msRest.CompositeMapper = {
+export const ApiReleaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseContract",
   type: {
     name: "Composite",
@@ -1881,7 +1881,7 @@ export const ApiReleaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionContract: msRest.CompositeMapper = {
+export const ApiRevisionContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionContract",
   type: {
     name: "Composite",
@@ -1954,7 +1954,7 @@ export const ApiRevisionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiUpdateContract: msRest.CompositeMapper = {
+export const ApiUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "ApiUpdateContract",
   type: {
     name: "Composite",
@@ -2097,7 +2097,7 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContract: msRest.CompositeMapper = {
+export const ApiContract: coreHttp.CompositeMapper = {
   serializedName: "ApiContract",
   type: {
     name: "Composite",
@@ -2255,7 +2255,7 @@ export const ApiContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateParameter: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateParameter",
   type: {
     name: "Composite",
@@ -2437,7 +2437,7 @@ export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
+export const ApiVersionSetEntityBase: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetEntityBase",
   type: {
     name: "Composite",
@@ -2473,7 +2473,7 @@ export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
+export const ApiVersionSetUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetUpdateParameters",
   type: {
     name: "Composite",
@@ -2525,7 +2525,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContract: msRest.CompositeMapper = {
+export const ApiVersionSetContract: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContract",
   type: {
     name: "Composite",
@@ -2580,7 +2580,7 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
   }
 };
 
-export const TokenBodyParameterContract: msRest.CompositeMapper = {
+export const TokenBodyParameterContract: coreHttp.CompositeMapper = {
   serializedName: "TokenBodyParameterContract",
   type: {
     name: "Composite",
@@ -2604,7 +2604,7 @@ export const TokenBodyParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper = {
+export const AuthorizationServerContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContractBaseProperties",
   type: {
     name: "Composite",
@@ -2711,7 +2711,7 @@ export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper =
   }
 };
 
-export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
+export const AuthorizationServerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerUpdateContract",
   type: {
     name: "Composite",
@@ -2858,7 +2858,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContract: msRest.CompositeMapper = {
+export const AuthorizationServerContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContract",
   type: {
     name: "Composite",
@@ -3010,7 +3010,7 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendReconnectContract: msRest.CompositeMapper = {
+export const BackendReconnectContract: coreHttp.CompositeMapper = {
   serializedName: "BackendReconnectContract",
   type: {
     name: "Composite",
@@ -3027,7 +3027,7 @@ export const BackendReconnectContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendTlsProperties: msRest.CompositeMapper = {
+export const BackendTlsProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendTlsProperties",
   type: {
     name: "Composite",
@@ -3051,7 +3051,7 @@ export const BackendTlsProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProxyContract: msRest.CompositeMapper = {
+export const BackendProxyContract: coreHttp.CompositeMapper = {
   serializedName: "BackendProxyContract",
   type: {
     name: "Composite",
@@ -3084,7 +3084,7 @@ export const BackendProxyContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
+export const BackendAuthorizationHeaderCredentials: coreHttp.CompositeMapper = {
   serializedName: "BackendAuthorizationHeaderCredentials",
   type: {
     name: "Composite",
@@ -3116,7 +3116,7 @@ export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCredentialsContract: msRest.CompositeMapper = {
+export const BackendCredentialsContract: coreHttp.CompositeMapper = {
   serializedName: "BackendCredentialsContract",
   type: {
     name: "Composite",
@@ -3179,7 +3179,7 @@ export const BackendCredentialsContract: msRest.CompositeMapper = {
   }
 };
 
-export const X509CertificateName: msRest.CompositeMapper = {
+export const X509CertificateName: coreHttp.CompositeMapper = {
   serializedName: "X509CertificateName",
   type: {
     name: "Composite",
@@ -3201,7 +3201,7 @@ export const X509CertificateName: msRest.CompositeMapper = {
   }
 };
 
-export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
+export const BackendServiceFabricClusterProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendServiceFabricClusterProperties",
   type: {
     name: "Composite",
@@ -3259,7 +3259,7 @@ export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProperties: msRest.CompositeMapper = {
+export const BackendProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendProperties",
   type: {
     name: "Composite",
@@ -3276,7 +3276,7 @@ export const BackendProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendBaseParameters: msRest.CompositeMapper = {
+export const BackendBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendBaseParameters",
   type: {
     name: "Composite",
@@ -3344,7 +3344,7 @@ export const BackendBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendUpdateParameters: msRest.CompositeMapper = {
+export const BackendUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendUpdateParameters",
   type: {
     name: "Composite",
@@ -3428,7 +3428,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendContract: msRest.CompositeMapper = {
+export const BackendContract: coreHttp.CompositeMapper = {
   serializedName: "BackendContract",
   type: {
     name: "Composite",
@@ -3515,7 +3515,7 @@ export const BackendContract: msRest.CompositeMapper = {
   }
 };
 
-export const CacheUpdateParameters: msRest.CompositeMapper = {
+export const CacheUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CacheUpdateParameters",
   type: {
     name: "Composite",
@@ -3552,7 +3552,7 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const CacheContract: msRest.CompositeMapper = {
+export const CacheContract: coreHttp.CompositeMapper = {
   serializedName: "CacheContract",
   type: {
     name: "Composite",
@@ -3591,7 +3591,7 @@ export const CacheContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateContract: msRest.CompositeMapper = {
+export const CertificateContract: coreHttp.CompositeMapper = {
   serializedName: "CertificateContract",
   type: {
     name: "Composite",
@@ -3623,7 +3623,7 @@ export const CertificateContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CertificateCreateOrUpdateParameters",
   type: {
     name: "Composite",
@@ -3647,7 +3647,7 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSku: msRest.CompositeMapper = {
+export const ResourceSku: coreHttp.CompositeMapper = {
   serializedName: "ResourceSku",
   type: {
     name: "Composite",
@@ -3663,7 +3663,7 @@ export const ResourceSku: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuCapacity: msRest.CompositeMapper = {
+export const ResourceSkuCapacity: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuCapacity",
   type: {
     name: "Composite",
@@ -3701,7 +3701,7 @@ export const ResourceSkuCapacity: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResult: msRest.CompositeMapper = {
+export const ResourceSkuResult: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResult",
   type: {
     name: "Composite",
@@ -3734,7 +3734,7 @@ export const ResourceSkuResult: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateInformation: msRest.CompositeMapper = {
+export const CertificateInformation: coreHttp.CompositeMapper = {
   serializedName: "CertificateInformation",
   type: {
     name: "Composite",
@@ -3765,7 +3765,7 @@ export const CertificateInformation: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateConfiguration: msRest.CompositeMapper = {
+export const CertificateConfiguration: coreHttp.CompositeMapper = {
   serializedName: "CertificateConfiguration",
   type: {
     name: "Composite",
@@ -3801,7 +3801,7 @@ export const CertificateConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const HostnameConfiguration: msRest.CompositeMapper = {
+export const HostnameConfiguration: coreHttp.CompositeMapper = {
   serializedName: "HostnameConfiguration",
   type: {
     name: "Composite",
@@ -3864,7 +3864,7 @@ export const HostnameConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
+export const VirtualNetworkConfiguration: coreHttp.CompositeMapper = {
   serializedName: "VirtualNetworkConfiguration",
   type: {
     name: "Composite",
@@ -3897,7 +3897,7 @@ export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceSkuProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceSkuProperties",
   type: {
     name: "Composite",
@@ -3920,7 +3920,7 @@ export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
   }
 };
 
-export const AdditionalLocation: msRest.CompositeMapper = {
+export const AdditionalLocation: coreHttp.CompositeMapper = {
   serializedName: "AdditionalLocation",
   type: {
     name: "Composite",
@@ -3983,7 +3983,7 @@ export const AdditionalLocation: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceBackupRestoreParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBackupRestoreParameters",
   type: {
     name: "Composite",
@@ -4021,7 +4021,7 @@ export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBaseProperties",
   type: {
     name: "Composite",
@@ -4188,7 +4188,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
+export const ApiManagementServiceIdentity: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceIdentity",
   type: {
     name: "Composite",
@@ -4221,7 +4221,7 @@ export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
   }
 };
 
-export const ApimResource: msRest.CompositeMapper = {
+export const ApimResource: coreHttp.CompositeMapper = {
   serializedName: "ApimResource",
   type: {
     name: "Composite",
@@ -4263,7 +4263,7 @@ export const ApimResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceResource: msRest.CompositeMapper = {
+export const ApiManagementServiceResource: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceResource",
   type: {
     name: "Composite",
@@ -4480,7 +4480,7 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceUpdateParameters",
   type: {
     name: "Composite",
@@ -4687,7 +4687,7 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
+export const ApiManagementServiceGetSsoTokenResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceGetSsoTokenResult",
   type: {
     name: "Composite",
@@ -4703,7 +4703,7 @@ export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceCheckNameAvailabilityParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
   type: {
     name: "Composite",
@@ -4720,7 +4720,7 @@ export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.Composi
   }
 };
 
-export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
+export const ApiManagementServiceNameAvailabilityResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceNameAvailabilityResult",
   type: {
     name: "Composite",
@@ -4755,7 +4755,7 @@ export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceApplyNetworkConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
   type: {
     name: "Composite",
@@ -4771,7 +4771,7 @@ export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.Com
   }
 };
 
-export const OperationDisplay: msRest.CompositeMapper = {
+export const OperationDisplay: coreHttp.CompositeMapper = {
   serializedName: "Operation_display",
   type: {
     name: "Composite",
@@ -4805,7 +4805,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
   }
 };
 
-export const Operation: msRest.CompositeMapper = {
+export const Operation: coreHttp.CompositeMapper = {
   serializedName: "Operation",
   type: {
     name: "Composite",
@@ -4840,7 +4840,7 @@ export const Operation: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
+export const EmailTemplateParametersContractProperties: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateParametersContractProperties",
   type: {
     name: "Composite",
@@ -4882,7 +4882,7 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+export const EmailTemplateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateUpdateParameters",
   type: {
     name: "Composite",
@@ -4935,7 +4935,7 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
+export const EmailTemplateContract: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateContract",
   type: {
     name: "Composite",
@@ -4998,7 +4998,7 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityContract: msRest.CompositeMapper = {
+export const UserIdentityContract: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityContract",
   type: {
     name: "Composite",
@@ -5020,7 +5020,7 @@ export const UserIdentityContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserEntityBaseParameters: msRest.CompositeMapper = {
+export const UserEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "UserEntityBaseParameters",
   type: {
     name: "Composite",
@@ -5055,7 +5055,7 @@ export const UserEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContractProperties: msRest.CompositeMapper = {
+export const GroupContractProperties: coreHttp.CompositeMapper = {
   serializedName: "GroupContractProperties",
   type: {
     name: "Composite",
@@ -5109,7 +5109,7 @@ export const GroupContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const UserContract: msRest.CompositeMapper = {
+export const UserContract: coreHttp.CompositeMapper = {
   serializedName: "UserContract",
   type: {
     name: "Composite",
@@ -5182,7 +5182,7 @@ export const UserContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupUpdateParameters: msRest.CompositeMapper = {
+export const GroupUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
@@ -5225,7 +5225,7 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContract: msRest.CompositeMapper = {
+export const GroupContract: coreHttp.CompositeMapper = {
   serializedName: "GroupContract",
   type: {
     name: "Composite",
@@ -5280,7 +5280,7 @@ export const GroupContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateParameters: msRest.CompositeMapper = {
+export const GroupCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupCreateParameters",
   type: {
     name: "Composite",
@@ -5324,7 +5324,7 @@ export const GroupCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
+export const IdentityProviderBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderBaseParameters",
   type: {
     name: "Composite",
@@ -5396,7 +5396,7 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+export const IdentityProviderUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
@@ -5486,7 +5486,7 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
+export const IdentityProviderContract: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
@@ -5579,7 +5579,7 @@ export const IdentityProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerUpdateContract: msRest.CompositeMapper = {
+export const LoggerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerUpdateContract",
   type: {
     name: "Composite",
@@ -5618,7 +5618,7 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerContract: msRest.CompositeMapper = {
+export const LoggerContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerContract",
   type: {
     name: "Composite",
@@ -5669,7 +5669,7 @@ export const LoggerContract: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityStatusContract: msRest.CompositeMapper = {
+export const ConnectivityStatusContract: coreHttp.CompositeMapper = {
   serializedName: "ConnectivityStatusContract",
   type: {
     name: "Composite",
@@ -5716,7 +5716,7 @@ export const ConnectivityStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContract: msRest.CompositeMapper = {
+export const NetworkStatusContract: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContract",
   type: {
     name: "Composite",
@@ -5751,7 +5751,7 @@ export const NetworkStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
+export const NetworkStatusContractByLocation: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContractByLocation",
   type: {
     name: "Composite",
@@ -5777,7 +5777,7 @@ export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailContract: msRest.CompositeMapper = {
+export const RecipientEmailContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailContract",
   type: {
     name: "Composite",
@@ -5794,7 +5794,7 @@ export const RecipientEmailContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailCollection: msRest.CompositeMapper = {
+export const RecipientEmailCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailCollection",
   type: {
     name: "Composite",
@@ -5822,7 +5822,7 @@ export const RecipientEmailCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserContract: msRest.CompositeMapper = {
+export const RecipientUserContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserContract",
   type: {
     name: "Composite",
@@ -5839,7 +5839,7 @@ export const RecipientUserContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserCollection: msRest.CompositeMapper = {
+export const RecipientUserCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserCollection",
   type: {
     name: "Composite",
@@ -5867,7 +5867,7 @@ export const RecipientUserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientsContractProperties: msRest.CompositeMapper = {
+export const RecipientsContractProperties: coreHttp.CompositeMapper = {
   serializedName: "RecipientsContractProperties",
   type: {
     name: "Composite",
@@ -5899,7 +5899,7 @@ export const RecipientsContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationContract: msRest.CompositeMapper = {
+export const NotificationContract: coreHttp.CompositeMapper = {
   serializedName: "NotificationContract",
   type: {
     name: "Composite",
@@ -5934,7 +5934,7 @@ export const NotificationContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderUpdateContract",
   type: {
     name: "Composite",
@@ -5977,7 +5977,7 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderContract",
   type: {
     name: "Composite",
@@ -6024,7 +6024,7 @@ export const OpenidConnectProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetContract: msRest.CompositeMapper = {
+export const PolicySnippetContract: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetContract",
   type: {
     name: "Composite",
@@ -6062,7 +6062,7 @@ export const PolicySnippetContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetsCollection: msRest.CompositeMapper = {
+export const PolicySnippetsCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetsCollection",
   type: {
     name: "Composite",
@@ -6084,7 +6084,7 @@ export const PolicySnippetsCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper = {
+export const RegistrationDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "RegistrationDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6100,7 +6100,7 @@ export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper = {
+export const SubscriptionsDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionsDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6116,7 +6116,7 @@ export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const PortalDelegationSettings: msRest.CompositeMapper = {
+export const PortalDelegationSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalDelegationSettings",
   type: {
     name: "Composite",
@@ -6153,7 +6153,7 @@ export const PortalDelegationSettings: msRest.CompositeMapper = {
   }
 };
 
-export const TermsOfServiceProperties: msRest.CompositeMapper = {
+export const TermsOfServiceProperties: coreHttp.CompositeMapper = {
   serializedName: "TermsOfServiceProperties",
   type: {
     name: "Composite",
@@ -6181,7 +6181,7 @@ export const TermsOfServiceProperties: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSignupSettings: msRest.CompositeMapper = {
+export const PortalSignupSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSignupSettings",
   type: {
     name: "Composite",
@@ -6205,7 +6205,7 @@ export const PortalSignupSettings: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSigninSettings: msRest.CompositeMapper = {
+export const PortalSigninSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSigninSettings",
   type: {
     name: "Composite",
@@ -6222,7 +6222,7 @@ export const PortalSigninSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionContract: msRest.CompositeMapper = {
+export const SubscriptionContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionContract",
   type: {
     name: "Composite",
@@ -6336,7 +6336,7 @@ export const SubscriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ProductUpdateParameters: msRest.CompositeMapper = {
+export const ProductUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductUpdateParameters",
   type: {
     name: "Composite",
@@ -6400,7 +6400,7 @@ export const ProductUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
+export const PropertyEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyEntityBaseParameters",
   type: {
     name: "Composite",
@@ -6430,7 +6430,7 @@ export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyUpdateParameters: msRest.CompositeMapper = {
+export const PropertyUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyUpdateParameters",
   type: {
     name: "Composite",
@@ -6481,7 +6481,7 @@ export const PropertyUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyContract: msRest.CompositeMapper = {
+export const PropertyContract: coreHttp.CompositeMapper = {
   serializedName: "PropertyContract",
   type: {
     name: "Composite",
@@ -6535,7 +6535,7 @@ export const PropertyContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
+export const QuotaCounterValueContractProperties: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContractProperties",
   type: {
     name: "Composite",
@@ -6557,7 +6557,7 @@ export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterContract: msRest.CompositeMapper = {
+export const QuotaCounterContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterContract",
   type: {
     name: "Composite",
@@ -6608,7 +6608,7 @@ export const QuotaCounterContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterCollection: msRest.CompositeMapper = {
+export const QuotaCounterCollection: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterCollection",
   type: {
     name: "Composite",
@@ -6642,7 +6642,7 @@ export const QuotaCounterCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportRecordContract: msRest.CompositeMapper = {
+export const RequestReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "RequestReportRecordContract",
   type: {
     name: "Composite",
@@ -6762,7 +6762,7 @@ export const RequestReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const ReportRecordContract: msRest.CompositeMapper = {
+export const ReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "ReportRecordContract",
   type: {
     name: "Composite",
@@ -6930,7 +6930,7 @@ export const ReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
+export const SubscriptionUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionUpdateParameters",
   type: {
     name: "Composite",
@@ -7010,7 +7010,7 @@ export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateParameters: msRest.CompositeMapper = {
+export const SubscriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCreateParameters",
   type: {
     name: "Composite",
@@ -7084,7 +7084,7 @@ export const SubscriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateUpdateParameters: msRest.CompositeMapper = {
+export const TagCreateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagCreateUpdateParameters",
   type: {
     name: "Composite",
@@ -7105,7 +7105,7 @@ export const TagCreateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
+export const TenantConfigurationSyncStateContract: coreHttp.CompositeMapper = {
   serializedName: "TenantConfigurationSyncStateContract",
   type: {
     name: "Composite",
@@ -7157,7 +7157,7 @@ export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultLogItemContract: msRest.CompositeMapper = {
+export const OperationResultLogItemContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultLogItemContract",
   type: {
     name: "Composite",
@@ -7185,7 +7185,7 @@ export const OperationResultLogItemContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultContract: msRest.CompositeMapper = {
+export const OperationResultContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultContract",
   type: {
     name: "Composite",
@@ -7251,7 +7251,7 @@ export const OperationResultContract: msRest.CompositeMapper = {
   }
 };
 
-export const DeployConfigurationParameters: msRest.CompositeMapper = {
+export const DeployConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "DeployConfigurationParameters",
   type: {
     name: "Composite",
@@ -7274,7 +7274,7 @@ export const DeployConfigurationParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SaveConfigurationParameter: msRest.CompositeMapper = {
+export const SaveConfigurationParameter: coreHttp.CompositeMapper = {
   serializedName: "SaveConfigurationParameter",
   type: {
     name: "Composite",
@@ -7297,7 +7297,7 @@ export const SaveConfigurationParameter: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationContract: msRest.CompositeMapper = {
+export const AccessInformationContract: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationContract",
   type: {
     name: "Composite",
@@ -7331,7 +7331,7 @@ export const AccessInformationContract: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
+export const AccessInformationUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationUpdateParameters",
   type: {
     name: "Composite",
@@ -7347,7 +7347,7 @@ export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenResult: msRest.CompositeMapper = {
+export const UserTokenResult: coreHttp.CompositeMapper = {
   serializedName: "UserTokenResult",
   type: {
     name: "Composite",
@@ -7363,7 +7363,7 @@ export const UserTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenParameters: msRest.CompositeMapper = {
+export const UserTokenParameters: coreHttp.CompositeMapper = {
   serializedName: "UserTokenParameters",
   type: {
     name: "Composite",
@@ -7392,7 +7392,7 @@ export const UserTokenParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GenerateSsoUrlResult: msRest.CompositeMapper = {
+export const GenerateSsoUrlResult: coreHttp.CompositeMapper = {
   serializedName: "GenerateSsoUrlResult",
   type: {
     name: "Composite",
@@ -7408,7 +7408,7 @@ export const GenerateSsoUrlResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserUpdateParameters: msRest.CompositeMapper = {
+export const UserUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserUpdateParameters",
   type: {
     name: "Composite",
@@ -7479,7 +7479,7 @@ export const UserUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateParameters: msRest.CompositeMapper = {
+export const UserCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserCreateParameters",
   type: {
     name: "Composite",
@@ -7559,7 +7559,7 @@ export const UserCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionInfoContract: msRest.CompositeMapper = {
+export const ApiRevisionInfoContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionInfoContract",
   type: {
     name: "Composite",
@@ -7600,7 +7600,7 @@ export const ApiRevisionInfoContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContract: msRest.CompositeMapper = {
+export const QuotaCounterValueContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContract",
   type: {
     name: "Composite",
@@ -7622,7 +7622,7 @@ export const QuotaCounterValueContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7638,7 +7638,7 @@ export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetHeaders: msRest.CompositeMapper = {
+export const ApiGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-get-headers",
   type: {
     name: "Composite",
@@ -7654,7 +7654,7 @@ export const ApiGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7670,7 +7670,7 @@ export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7686,7 +7686,7 @@ export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-get-headers",
   type: {
     name: "Composite",
@@ -7702,7 +7702,7 @@ export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiReleaseCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7718,7 +7718,7 @@ export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7734,7 +7734,7 @@ export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-get-headers",
   type: {
     name: "Composite",
@@ -7750,7 +7750,7 @@ export const ApiOperationGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7766,7 +7766,7 @@ export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7782,7 +7782,7 @@ export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-get-headers",
   type: {
     name: "Composite",
@@ -7798,7 +7798,7 @@ export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7814,7 +7814,7 @@ export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyoperation-headers",
   type: {
     name: "Composite",
@@ -7830,7 +7830,7 @@ export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyoperation-headers",
   type: {
     name: "Composite",
@@ -7846,7 +7846,7 @@ export const TagGetByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7862,7 +7862,7 @@ export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-get-headers",
   type: {
     name: "Composite",
@@ -7878,7 +7878,7 @@ export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7894,7 +7894,7 @@ export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7910,7 +7910,7 @@ export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-get-headers",
   type: {
     name: "Composite",
@@ -7926,7 +7926,7 @@ export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiSchemaCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7942,7 +7942,7 @@ export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7958,7 +7958,7 @@ export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-get-headers",
   type: {
     name: "Composite",
@@ -7974,7 +7974,7 @@ export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7990,7 +7990,7 @@ export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8006,7 +8006,7 @@ export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-get-headers",
   type: {
     name: "Composite",
@@ -8022,7 +8022,7 @@ export const ApiIssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8038,7 +8038,7 @@ export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8054,7 +8054,7 @@ export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-get-headers",
   type: {
     name: "Composite",
@@ -8070,7 +8070,7 @@ export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8086,7 +8086,7 @@ export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8102,7 +8102,7 @@ export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-get-headers",
   type: {
     name: "Composite",
@@ -8118,7 +8118,7 @@ export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8134,7 +8134,7 @@ export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8150,7 +8150,7 @@ export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-get-headers",
   type: {
     name: "Composite",
@@ -8166,7 +8166,7 @@ export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8182,7 +8182,7 @@ export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyapi-headers",
   type: {
     name: "Composite",
@@ -8198,7 +8198,7 @@ export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByApiHeaders: msRest.CompositeMapper = {
+export const TagGetByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyapi-headers",
   type: {
     name: "Composite",
@@ -8214,7 +8214,7 @@ export const TagGetByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagAssignToApiHeaders: msRest.CompositeMapper = {
+export const TagAssignToApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-assigntoapi-headers",
   type: {
     name: "Composite",
@@ -8230,7 +8230,7 @@ export const TagAssignToApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8246,7 +8246,7 @@ export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-get-headers",
   type: {
     name: "Composite",
@@ -8262,7 +8262,7 @@ export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8278,7 +8278,7 @@ export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8294,7 +8294,7 @@ export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-get-headers",
   type: {
     name: "Composite",
@@ -8310,7 +8310,7 @@ export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8326,7 +8326,7 @@ export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper =
   }
 };
 
-export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
+export const BackendGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8342,7 +8342,7 @@ export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendGetHeaders: msRest.CompositeMapper = {
+export const BackendGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-get-headers",
   type: {
     name: "Composite",
@@ -8358,7 +8358,7 @@ export const BackendGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const BackendCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8374,7 +8374,7 @@ export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CacheGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8390,7 +8390,7 @@ export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetHeaders: msRest.CompositeMapper = {
+export const CacheGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-get-headers",
   type: {
     name: "Composite",
@@ -8406,7 +8406,7 @@ export const CacheGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CacheCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8422,7 +8422,7 @@ export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CertificateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8438,7 +8438,7 @@ export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetHeaders: msRest.CompositeMapper = {
+export const CertificateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-get-headers",
   type: {
     name: "Composite",
@@ -8454,7 +8454,7 @@ export const CertificateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8470,7 +8470,7 @@ export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8486,7 +8486,7 @@ export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-get-headers",
   type: {
     name: "Composite",
@@ -8502,7 +8502,7 @@ export const DiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const DiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8518,7 +8518,7 @@ export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8534,7 +8534,7 @@ export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-get-headers",
   type: {
     name: "Composite",
@@ -8550,7 +8550,7 @@ export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
+export const GroupGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8566,7 +8566,7 @@ export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetHeaders: msRest.CompositeMapper = {
+export const GroupGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-get-headers",
   type: {
     name: "Composite",
@@ -8582,7 +8582,7 @@ export const GroupGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const GroupCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8598,7 +8598,7 @@ export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8614,7 +8614,7 @@ export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-get-headers",
   type: {
     name: "Composite",
@@ -8630,7 +8630,7 @@ export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const IdentityProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8646,7 +8646,7 @@ export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IssueGetHeaders: msRest.CompositeMapper = {
+export const IssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "issue-get-headers",
   type: {
     name: "Composite",
@@ -8662,7 +8662,7 @@ export const IssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const LoggerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8678,7 +8678,7 @@ export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetHeaders: msRest.CompositeMapper = {
+export const LoggerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-get-headers",
   type: {
     name: "Composite",
@@ -8694,7 +8694,7 @@ export const LoggerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const LoggerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8710,7 +8710,7 @@ export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8726,7 +8726,7 @@ export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper =
   }
 };
 
-export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-get-headers",
   type: {
     name: "Composite",
@@ -8742,7 +8742,7 @@ export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8758,7 +8758,7 @@ export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper
   }
 };
 
-export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8774,7 +8774,7 @@ export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyGetHeaders: msRest.CompositeMapper = {
+export const PolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-get-headers",
   type: {
     name: "Composite",
@@ -8790,7 +8790,7 @@ export const PolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8806,7 +8806,7 @@ export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8822,7 +8822,7 @@ export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-get-headers",
   type: {
     name: "Composite",
@@ -8838,7 +8838,7 @@ export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8854,7 +8854,7 @@ export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-get-headers",
   type: {
     name: "Composite",
@@ -8870,7 +8870,7 @@ export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8886,7 +8886,7 @@ export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-get-headers",
   type: {
     name: "Composite",
@@ -8902,7 +8902,7 @@ export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8918,7 +8918,7 @@ export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetHeaders: msRest.CompositeMapper = {
+export const ProductGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-get-headers",
   type: {
     name: "Composite",
@@ -8934,7 +8934,7 @@ export const ProductGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8950,7 +8950,7 @@ export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8966,7 +8966,7 @@ export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-get-headers",
   type: {
     name: "Composite",
@@ -8982,7 +8982,7 @@ export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8998,7 +8998,7 @@ export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyproduct-headers",
   type: {
     name: "Composite",
@@ -9014,7 +9014,7 @@ export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByProductHeaders: msRest.CompositeMapper = {
+export const TagGetByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyproduct-headers",
   type: {
     name: "Composite",
@@ -9030,7 +9030,7 @@ export const TagGetByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PropertyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9046,7 +9046,7 @@ export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetHeaders: msRest.CompositeMapper = {
+export const PropertyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-get-headers",
   type: {
     name: "Composite",
@@ -9062,7 +9062,7 @@ export const PropertyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PropertyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9078,7 +9078,7 @@ export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9094,7 +9094,7 @@ export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-get-headers",
   type: {
     name: "Composite",
@@ -9110,7 +9110,7 @@ export const SubscriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const SubscriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9126,7 +9126,7 @@ export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystate-headers",
   type: {
     name: "Composite",
@@ -9142,7 +9142,7 @@ export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetHeaders: msRest.CompositeMapper = {
+export const TagGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-get-headers",
   type: {
     name: "Composite",
@@ -9158,7 +9158,7 @@ export const TagGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const TagCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9174,7 +9174,7 @@ export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9190,7 +9190,7 @@ export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-get-headers",
   type: {
     name: "Composite",
@@ -9206,7 +9206,7 @@ export const TenantAccessGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGitGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccessgit-get-headers",
   type: {
     name: "Composite",
@@ -9222,7 +9222,7 @@ export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
+export const UserGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9238,7 +9238,7 @@ export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetHeaders: msRest.CompositeMapper = {
+export const UserGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-get-headers",
   type: {
     name: "Composite",
@@ -9254,7 +9254,7 @@ export const UserGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const UserCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9270,7 +9270,7 @@ export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCollection: msRest.CompositeMapper = {
+export const ApiCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiCollection",
   type: {
     name: "Composite",
@@ -9300,7 +9300,7 @@ export const ApiCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceCollection: msRest.CompositeMapper = {
+export const TagResourceCollection: coreHttp.CompositeMapper = {
   serializedName: "TagResourceCollection",
   type: {
     name: "Composite",
@@ -9328,7 +9328,7 @@ export const TagResourceCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionCollection: msRest.CompositeMapper = {
+export const ApiRevisionCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionCollection",
   type: {
     name: "Composite",
@@ -9358,7 +9358,7 @@ export const ApiRevisionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCollection: msRest.CompositeMapper = {
+export const ApiReleaseCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseCollection",
   type: {
     name: "Composite",
@@ -9388,7 +9388,7 @@ export const ApiReleaseCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationCollection: msRest.CompositeMapper = {
+export const OperationCollection: coreHttp.CompositeMapper = {
   serializedName: "OperationCollection",
   type: {
     name: "Composite",
@@ -9418,7 +9418,7 @@ export const OperationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagCollection: msRest.CompositeMapper = {
+export const TagCollection: coreHttp.CompositeMapper = {
   serializedName: "TagCollection",
   type: {
     name: "Composite",
@@ -9446,7 +9446,7 @@ export const TagCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCollection: msRest.CompositeMapper = {
+export const ProductCollection: coreHttp.CompositeMapper = {
   serializedName: "ProductCollection",
   type: {
     name: "Composite",
@@ -9474,7 +9474,7 @@ export const ProductCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCollection: msRest.CompositeMapper = {
+export const SchemaCollection: coreHttp.CompositeMapper = {
   serializedName: "SchemaCollection",
   type: {
     name: "Composite",
@@ -9504,7 +9504,7 @@ export const SchemaCollection: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCollection: msRest.CompositeMapper = {
+export const DiagnosticCollection: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticCollection",
   type: {
     name: "Composite",
@@ -9532,7 +9532,7 @@ export const DiagnosticCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCollection: msRest.CompositeMapper = {
+export const IssueCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCollection",
   type: {
     name: "Composite",
@@ -9562,7 +9562,7 @@ export const IssueCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentCollection: msRest.CompositeMapper = {
+export const IssueCommentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentCollection",
   type: {
     name: "Composite",
@@ -9592,7 +9592,7 @@ export const IssueCommentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentCollection: msRest.CompositeMapper = {
+export const IssueAttachmentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentCollection",
   type: {
     name: "Composite",
@@ -9622,7 +9622,7 @@ export const IssueAttachmentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCollection: msRest.CompositeMapper = {
+export const TagDescriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCollection",
   type: {
     name: "Composite",
@@ -9650,7 +9650,7 @@ export const TagDescriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCollection: msRest.CompositeMapper = {
+export const ApiVersionSetCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetCollection",
   type: {
     name: "Composite",
@@ -9678,7 +9678,7 @@ export const ApiVersionSetCollection: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCollection: msRest.CompositeMapper = {
+export const AuthorizationServerCollection: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerCollection",
   type: {
     name: "Composite",
@@ -9712,7 +9712,7 @@ export const AuthorizationServerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCollection: msRest.CompositeMapper = {
+export const BackendCollection: coreHttp.CompositeMapper = {
   serializedName: "BackendCollection",
   type: {
     name: "Composite",
@@ -9740,7 +9740,7 @@ export const BackendCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCollection: msRest.CompositeMapper = {
+export const CacheCollection: coreHttp.CompositeMapper = {
   serializedName: "CacheCollection",
   type: {
     name: "Composite",
@@ -9768,7 +9768,7 @@ export const CacheCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCollection: msRest.CompositeMapper = {
+export const CertificateCollection: coreHttp.CompositeMapper = {
   serializedName: "CertificateCollection",
   type: {
     name: "Composite",
@@ -9796,7 +9796,7 @@ export const CertificateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationListResult: msRest.CompositeMapper = {
+export const OperationListResult: coreHttp.CompositeMapper = {
   serializedName: "OperationListResult",
   type: {
     name: "Composite",
@@ -9824,7 +9824,7 @@ export const OperationListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResults: msRest.CompositeMapper = {
+export const ResourceSkuResults: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResults",
   type: {
     name: "Composite",
@@ -9853,7 +9853,7 @@ export const ResourceSkuResults: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceListResult: msRest.CompositeMapper = {
+export const ApiManagementServiceListResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceListResult",
   type: {
     name: "Composite",
@@ -9882,7 +9882,7 @@ export const ApiManagementServiceListResult: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateCollection: msRest.CompositeMapper = {
+export const EmailTemplateCollection: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateCollection",
   type: {
     name: "Composite",
@@ -9910,7 +9910,7 @@ export const EmailTemplateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCollection: msRest.CompositeMapper = {
+export const GroupCollection: coreHttp.CompositeMapper = {
   serializedName: "GroupCollection",
   type: {
     name: "Composite",
@@ -9938,7 +9938,7 @@ export const GroupCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserCollection: msRest.CompositeMapper = {
+export const UserCollection: coreHttp.CompositeMapper = {
   serializedName: "UserCollection",
   type: {
     name: "Composite",
@@ -9966,7 +9966,7 @@ export const UserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderList: msRest.CompositeMapper = {
+export const IdentityProviderList: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderList",
   type: {
     name: "Composite",
@@ -9994,7 +9994,7 @@ export const IdentityProviderList: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCollection: msRest.CompositeMapper = {
+export const LoggerCollection: coreHttp.CompositeMapper = {
   serializedName: "LoggerCollection",
   type: {
     name: "Composite",
@@ -10028,7 +10028,7 @@ export const LoggerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationCollection: msRest.CompositeMapper = {
+export const NotificationCollection: coreHttp.CompositeMapper = {
   serializedName: "NotificationCollection",
   type: {
     name: "Composite",
@@ -10056,7 +10056,7 @@ export const NotificationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCollection: coreHttp.CompositeMapper = {
   serializedName: "OpenIdConnectProviderCollection",
   type: {
     name: "Composite",
@@ -10084,7 +10084,7 @@ export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCollection: msRest.CompositeMapper = {
+export const SubscriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCollection",
   type: {
     name: "Composite",
@@ -10112,7 +10112,7 @@ export const SubscriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCollection: msRest.CompositeMapper = {
+export const PropertyCollection: coreHttp.CompositeMapper = {
   serializedName: "PropertyCollection",
   type: {
     name: "Composite",
@@ -10140,7 +10140,7 @@ export const PropertyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegionListResult: msRest.CompositeMapper = {
+export const RegionListResult: coreHttp.CompositeMapper = {
   serializedName: "RegionListResult",
   type: {
     name: "Composite",
@@ -10174,7 +10174,7 @@ export const RegionListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ReportCollection: msRest.CompositeMapper = {
+export const ReportCollection: coreHttp.CompositeMapper = {
   serializedName: "ReportCollection",
   type: {
     name: "Composite",
@@ -10208,7 +10208,7 @@ export const ReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportCollection: msRest.CompositeMapper = {
+export const RequestReportCollection: coreHttp.CompositeMapper = {
   serializedName: "RequestReportCollection",
   type: {
     name: "Composite",
@@ -10236,7 +10236,7 @@ export const RequestReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityCollection: msRest.CompositeMapper = {
+export const UserIdentityCollection: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityCollection",
   type: {
     name: "Composite",
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index b300ade09092..d21da1dce55a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
@@ -8,9 +8,9 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 
-export const acceptLanguage: msRest.OperationParameter = {
+export const acceptLanguage: coreHttp.OperationParameter = {
   parameterPath: "acceptLanguage",
   mapper: {
     serializedName: "accept-language",
@@ -20,7 +20,7 @@ export const acceptLanguage: msRest.OperationParameter = {
     }
   }
 };
-export const accessName: msRest.OperationURLParameter = {
+export const accessName: coreHttp.OperationURLParameter = {
   parameterPath: "accessName",
   mapper: {
     required: true,
@@ -32,7 +32,7 @@ export const accessName: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId0: msRest.OperationURLParameter = {
+export const apiId0: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
@@ -47,22 +47,21 @@ export const apiId0: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId1: msRest.OperationURLParameter = {
+export const apiId1: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
     serializedName: "apiId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const apiVersion: msRest.OperationQueryParameter = {
+export const apiVersion: coreHttp.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
@@ -72,7 +71,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
     }
   }
 };
-export const attachmentId: msRest.OperationURLParameter = {
+export const attachmentId: coreHttp.OperationURLParameter = {
   parameterPath: "attachmentId",
   mapper: {
     required: true,
@@ -87,7 +86,7 @@ export const attachmentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const authsid: msRest.OperationURLParameter = {
+export const authsid: coreHttp.OperationURLParameter = {
   parameterPath: "authsid",
   mapper: {
     required: true,
@@ -102,22 +101,21 @@ export const authsid: msRest.OperationURLParameter = {
     }
   }
 };
-export const backendId: msRest.OperationURLParameter = {
+export const backendId: coreHttp.OperationURLParameter = {
   parameterPath: "backendId",
   mapper: {
     required: true,
     serializedName: "backendId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const cacheId: msRest.OperationURLParameter = {
+export const cacheId: coreHttp.OperationURLParameter = {
   parameterPath: "cacheId",
   mapper: {
     required: true,
@@ -132,7 +130,7 @@ export const cacheId: msRest.OperationURLParameter = {
     }
   }
 };
-export const certificateId: msRest.OperationURLParameter = {
+export const certificateId: coreHttp.OperationURLParameter = {
   parameterPath: "certificateId",
   mapper: {
     required: true,
@@ -147,7 +145,7 @@ export const certificateId: msRest.OperationURLParameter = {
     }
   }
 };
-export const commentId: msRest.OperationURLParameter = {
+export const commentId: coreHttp.OperationURLParameter = {
   parameterPath: "commentId",
   mapper: {
     required: true,
@@ -162,7 +160,7 @@ export const commentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const configurationName: msRest.OperationURLParameter = {
+export const configurationName: coreHttp.OperationURLParameter = {
   parameterPath: "configurationName",
   mapper: {
     required: true,
@@ -174,7 +172,7 @@ export const configurationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const deleteRevisions: msRest.OperationQueryParameter = {
+export const deleteRevisions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteRevisions"
@@ -186,7 +184,7 @@ export const deleteRevisions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const deleteSubscriptions: msRest.OperationQueryParameter = {
+export const deleteSubscriptions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteSubscriptions"
@@ -198,7 +196,7 @@ export const deleteSubscriptions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const diagnosticId: msRest.OperationURLParameter = {
+export const diagnosticId: coreHttp.OperationURLParameter = {
   parameterPath: "diagnosticId",
   mapper: {
     required: true,
@@ -213,7 +211,7 @@ export const diagnosticId: msRest.OperationURLParameter = {
     }
   }
 };
-export const email: msRest.OperationURLParameter = {
+export const email: coreHttp.OperationURLParameter = {
   parameterPath: "email",
   mapper: {
     required: true,
@@ -223,7 +221,7 @@ export const email: msRest.OperationURLParameter = {
     }
   }
 };
-export const expandApiVersionSet: msRest.OperationQueryParameter = {
+export const expandApiVersionSet: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandApiVersionSet"
@@ -235,7 +233,7 @@ export const expandApiVersionSet: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandCommentsAttachments: msRest.OperationQueryParameter = {
+export const expandCommentsAttachments: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandCommentsAttachments"
@@ -247,7 +245,7 @@ export const expandCommentsAttachments: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandGroups: msRest.OperationQueryParameter = {
+export const expandGroups: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandGroups"
@@ -259,7 +257,7 @@ export const expandGroups: msRest.OperationQueryParameter = {
     }
   }
 };
-export const exportParameter: msRest.OperationQueryParameter = {
+export const exportParameter: coreHttp.OperationQueryParameter = {
   parameterPath: "exportParameter",
   mapper: {
     required: true,
@@ -271,7 +269,7 @@ export const exportParameter: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter0: msRest.OperationQueryParameter = {
+export const filter0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "filter"
@@ -283,7 +281,7 @@ export const filter0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter1: msRest.OperationQueryParameter = {
+export const filter1: coreHttp.OperationQueryParameter = {
   parameterPath: "filter",
   mapper: {
     required: true,
@@ -293,7 +291,7 @@ export const filter1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const force: msRest.OperationQueryParameter = {
+export const force: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "force"
@@ -305,7 +303,7 @@ export const force: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format0: msRest.OperationQueryParameter = {
+export const format0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "format"
@@ -318,7 +316,7 @@ export const format0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format1: msRest.OperationQueryParameter = {
+export const format1: coreHttp.OperationQueryParameter = {
   parameterPath: "format",
   mapper: {
     required: true,
@@ -328,22 +326,21 @@ export const format1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const groupId: msRest.OperationURLParameter = {
+export const groupId: coreHttp.OperationURLParameter = {
   parameterPath: "groupId",
   mapper: {
     required: true,
     serializedName: "groupId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const identityProviderName: msRest.OperationURLParameter = {
+export const identityProviderName: coreHttp.OperationURLParameter = {
   parameterPath: "identityProviderName",
   mapper: {
     required: true,
@@ -353,7 +350,7 @@ export const identityProviderName: msRest.OperationURLParameter = {
     }
   }
 };
-export const ifMatch0: msRest.OperationParameter = {
+export const ifMatch0: coreHttp.OperationParameter = {
   parameterPath: [
     "options",
     "ifMatch"
@@ -365,7 +362,7 @@ export const ifMatch0: msRest.OperationParameter = {
     }
   }
 };
-export const ifMatch1: msRest.OperationParameter = {
+export const ifMatch1: coreHttp.OperationParameter = {
   parameterPath: "ifMatch",
   mapper: {
     required: true,
@@ -375,7 +372,7 @@ export const ifMatch1: msRest.OperationParameter = {
     }
   }
 };
-export const includeNotTaggedApis: msRest.OperationQueryParameter = {
+export const includeNotTaggedApis: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedApis"
@@ -387,7 +384,7 @@ export const includeNotTaggedApis: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
+export const includeNotTaggedOperations: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedOperations"
@@ -399,7 +396,7 @@ export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
+export const includeNotTaggedProducts: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedProducts"
@@ -411,7 +408,7 @@ export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
     }
   }
 };
-export const interval: msRest.OperationQueryParameter = {
+export const interval: coreHttp.OperationQueryParameter = {
   parameterPath: "interval",
   mapper: {
     required: true,
@@ -421,7 +418,7 @@ export const interval: msRest.OperationQueryParameter = {
     }
   }
 };
-export const issueId: msRest.OperationURLParameter = {
+export const issueId: coreHttp.OperationURLParameter = {
   parameterPath: "issueId",
   mapper: {
     required: true,
@@ -436,7 +433,7 @@ export const issueId: msRest.OperationURLParameter = {
     }
   }
 };
-export const locationName: msRest.OperationURLParameter = {
+export const locationName: coreHttp.OperationURLParameter = {
   parameterPath: "locationName",
   mapper: {
     required: true,
@@ -449,7 +446,7 @@ export const locationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const loggerId: msRest.OperationURLParameter = {
+export const loggerId: coreHttp.OperationURLParameter = {
   parameterPath: "loggerId",
   mapper: {
     required: true,
@@ -463,7 +460,7 @@ export const loggerId: msRest.OperationURLParameter = {
     }
   }
 };
-export const nextPageLink: msRest.OperationURLParameter = {
+export const nextPageLink: coreHttp.OperationURLParameter = {
   parameterPath: "nextPageLink",
   mapper: {
     required: true,
@@ -474,7 +471,7 @@ export const nextPageLink: msRest.OperationURLParameter = {
   },
   skipEncoding: true
 };
-export const notificationName: msRest.OperationURLParameter = {
+export const notificationName: coreHttp.OperationURLParameter = {
   parameterPath: "notificationName",
   mapper: {
     required: true,
@@ -484,7 +481,7 @@ export const notificationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const notify: msRest.OperationQueryParameter = {
+export const notify: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "notify"
@@ -496,22 +493,21 @@ export const notify: msRest.OperationQueryParameter = {
     }
   }
 };
-export const operationId: msRest.OperationURLParameter = {
+export const operationId: coreHttp.OperationURLParameter = {
   parameterPath: "operationId",
   mapper: {
     required: true,
     serializedName: "operationId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const opid: msRest.OperationURLParameter = {
+export const opid: coreHttp.OperationURLParameter = {
   parameterPath: "opid",
   mapper: {
     required: true,
@@ -525,7 +521,7 @@ export const opid: msRest.OperationURLParameter = {
     }
   }
 };
-export const orderby: msRest.OperationQueryParameter = {
+export const orderby: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "orderby"
@@ -537,7 +533,7 @@ export const orderby: msRest.OperationQueryParameter = {
     }
   }
 };
-export const policyId: msRest.OperationURLParameter = {
+export const policyId: coreHttp.OperationURLParameter = {
   parameterPath: "policyId",
   mapper: {
     required: true,
@@ -549,22 +545,21 @@ export const policyId: msRest.OperationURLParameter = {
     }
   }
 };
-export const productId: msRest.OperationURLParameter = {
+export const productId: coreHttp.OperationURLParameter = {
   parameterPath: "productId",
   mapper: {
     required: true,
     serializedName: "productId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const propId: msRest.OperationURLParameter = {
+export const propId: coreHttp.OperationURLParameter = {
   parameterPath: "propId",
   mapper: {
     required: true,
@@ -578,7 +573,7 @@ export const propId: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaCounterKey: msRest.OperationURLParameter = {
+export const quotaCounterKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaCounterKey",
   mapper: {
     required: true,
@@ -588,7 +583,7 @@ export const quotaCounterKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaPeriodKey: msRest.OperationURLParameter = {
+export const quotaPeriodKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaPeriodKey",
   mapper: {
     required: true,
@@ -598,7 +593,7 @@ export const quotaPeriodKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const releaseId: msRest.OperationURLParameter = {
+export const releaseId: coreHttp.OperationURLParameter = {
   parameterPath: "releaseId",
   mapper: {
     required: true,
@@ -613,7 +608,7 @@ export const releaseId: msRest.OperationURLParameter = {
     }
   }
 };
-export const resourceGroupName: msRest.OperationURLParameter = {
+export const resourceGroupName: coreHttp.OperationURLParameter = {
   parameterPath: "resourceGroupName",
   mapper: {
     required: true,
@@ -623,7 +618,7 @@ export const resourceGroupName: msRest.OperationURLParameter = {
     }
   }
 };
-export const schemaId: msRest.OperationURLParameter = {
+export const schemaId: coreHttp.OperationURLParameter = {
   parameterPath: "schemaId",
   mapper: {
     required: true,
@@ -638,7 +633,7 @@ export const schemaId: msRest.OperationURLParameter = {
     }
   }
 };
-export const scope0: msRest.OperationQueryParameter = {
+export const scope0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -650,7 +645,7 @@ export const scope0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const scope1: msRest.OperationQueryParameter = {
+export const scope1: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -669,7 +664,7 @@ export const scope1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const serviceName: msRest.OperationURLParameter = {
+export const serviceName: coreHttp.OperationURLParameter = {
   parameterPath: "serviceName",
   mapper: {
     required: true,
@@ -684,7 +679,7 @@ export const serviceName: msRest.OperationURLParameter = {
     }
   }
 };
-export const sid: msRest.OperationURLParameter = {
+export const sid: coreHttp.OperationURLParameter = {
   parameterPath: "sid",
   mapper: {
     required: true,
@@ -698,7 +693,7 @@ export const sid: msRest.OperationURLParameter = {
     }
   }
 };
-export const skip: msRest.OperationQueryParameter = {
+export const skip: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "skip"
@@ -713,7 +708,7 @@ export const skip: msRest.OperationQueryParameter = {
     }
   }
 };
-export const subscriptionId: msRest.OperationURLParameter = {
+export const subscriptionId: coreHttp.OperationURLParameter = {
   parameterPath: "subscriptionId",
   mapper: {
     required: true,
@@ -723,7 +718,7 @@ export const subscriptionId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tagId: msRest.OperationURLParameter = {
+export const tagId: coreHttp.OperationURLParameter = {
   parameterPath: "tagId",
   mapper: {
     required: true,
@@ -738,7 +733,7 @@ export const tagId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tags: msRest.OperationQueryParameter = {
+export const tags: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "tags"
@@ -750,7 +745,7 @@ export const tags: msRest.OperationQueryParameter = {
     }
   }
 };
-export const templateName: msRest.OperationURLParameter = {
+export const templateName: coreHttp.OperationURLParameter = {
   parameterPath: "templateName",
   mapper: {
     required: true,
@@ -760,7 +755,7 @@ export const templateName: msRest.OperationURLParameter = {
     }
   }
 };
-export const top: msRest.OperationQueryParameter = {
+export const top: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "top"
@@ -775,22 +770,21 @@ export const top: msRest.OperationQueryParameter = {
     }
   }
 };
-export const userId: msRest.OperationURLParameter = {
+export const userId: coreHttp.OperationURLParameter = {
   parameterPath: "userId",
   mapper: {
     required: true,
     serializedName: "userId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const versionSetId: msRest.OperationURLParameter = {
+export const versionSetId: coreHttp.OperationURLParameter = {
   parameterPath: "versionSetId",
   mapper: {
     required: true,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..62893a65e480 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiMappers";
 import * as Parameters from "../models/parameters";
@@ -40,15 +40,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,9 +162,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -175,7 +175,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -211,9 +211,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -223,7 +223,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,15 +261,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,9 +288,9 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param parameters Create or update parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -337,19 +337,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -361,8 +361,8 @@ export class Api {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis",
   urlParameters: [
@@ -392,7 +392,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -445,7 +445,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -477,7 +477,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -504,7 +504,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apisByTags",
   urlParameters: [
@@ -533,7 +533,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -575,7 +575,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -596,7 +596,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
index aac5ab05ff5e..e4834d6ce0c4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiDiagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiDiagnostic {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -72,7 +72,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,7 +81,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -115,7 +115,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,7 +124,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -134,8 +134,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ export class ApiDiagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -206,9 +206,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -220,7 +220,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -233,8 +233,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -259,9 +259,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -272,7 +272,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -305,19 +305,19 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -329,8 +329,8 @@ export class ApiDiagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics",
   urlParameters: [
@@ -359,7 +359,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -414,7 +414,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -454,7 +454,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -487,7 +487,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -514,7 +514,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
index eccbf4429a22..9ea84a86b30c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiExportMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiExport {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiExportGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class ApiExport {
    * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'Openapi'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class ApiExport {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiExportResult>, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiExportResult>, callback?: coreHttp.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -75,8 +75,8 @@ export class ApiExport {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..527626919d80 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiIssue {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,7 +161,7 @@ export class ApiIssue {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -171,8 +171,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -196,9 +196,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -209,7 +209,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -221,8 +221,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,9 +246,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -258,7 +258,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -269,8 +269,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -290,19 +290,19 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -314,8 +314,8 @@ export class ApiIssue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues",
   urlParameters: [
@@ -345,7 +345,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -401,7 +401,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -474,7 +474,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -501,7 +501,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
index 9392f644c44d..d4098f4441ba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueAttachmentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueAttachment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueAttachment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueAttachment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueAttachment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueAttachment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
index 8f4584a711ee..9938dad7fa57 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueCommentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueComment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueComment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueComment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueComment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueComment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
index 043449470e76..4b4a2370c112 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -31,17 +31,17 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -56,19 +56,19 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -80,8 +80,8 @@ export class ApiManagementOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "providers/Microsoft.ApiManagement/operations",
   queryParameters: [
@@ -101,7 +101,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
index e098f991f33b..4def1deb0c6a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceRestoreResponse>
    */
-  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
+  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
     return this.beginRestore(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceRestoreResponse>;
   }
@@ -52,7 +52,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceBackupResponse>
    */
-  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
+  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
     return this.beginBackup(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceBackupResponse>;
   }
@@ -66,7 +66,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
     return this.beginCreateOrUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceCreateOrUpdateResponse>;
   }
@@ -79,7 +79,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
     return this.beginUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceUpdateResponse>;
   }
@@ -91,21 +91,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceResource>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceResource>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -123,7 +123,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceDeleteMethodResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
     return this.beginDeleteMethod(resourceGroupName,serviceName,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceDeleteMethodResponse>;
   }
@@ -134,19 +134,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupResponse>
    */
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
+  listByResourceGroup(resourceGroupName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,17 +161,17 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -187,21 +187,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetSsoTokenResponse>
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
+  getSsoToken(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,19 +218,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
     return this.client.sendOperationRequest(
       {
         parameters,
@@ -262,9 +262,9 @@ export class ApiManagementService {
    * @param parameters Parameters supplied to the Restore API Management service from backup
    * operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the ApiManagementService_Backup operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -304,9 +304,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -324,9 +324,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -343,9 +343,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -362,9 +362,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -381,19 +381,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>
    */
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
+  listByResourceGroupNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -409,19 +409,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -433,8 +433,8 @@ export class ApiManagementService {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -459,7 +459,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByResourceGroupOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -483,7 +483,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listOperationSpec: msRest.OperationSpec = {
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -506,7 +506,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSsoTokenOperationSpec: msRest.OperationSpec = {
+const getSsoTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/getssotoken",
   urlParameters: [
@@ -531,7 +531,7 @@ const getSsoTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
+const checkNameAvailabilityOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/checkNameAvailability",
   urlParameters: [
@@ -561,7 +561,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginRestoreOperationSpec: msRest.OperationSpec = {
+const beginRestoreOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore",
   urlParameters: [
@@ -594,7 +594,7 @@ const beginRestoreOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginBackupOperationSpec: msRest.OperationSpec = {
+const beginBackupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup",
   urlParameters: [
@@ -627,7 +627,7 @@ const beginBackupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -663,7 +663,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginUpdateOperationSpec: msRest.OperationSpec = {
+const beginUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -696,7 +696,7 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
+const beginDeleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -723,7 +723,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec = {
+const beginApplyNetworkConfigurationUpdatesOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/applynetworkconfigurationupdates",
   urlParameters: [
@@ -756,7 +756,7 @@ const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec =
   serializer
 };
 
-const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -777,7 +777,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
index 4ed93c82e480..4df1cfc2e754 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceSkusMappers";
 import * as Parameters from "../models/parameters";
@@ -34,21 +34,21 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,19 +66,19 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
+  listAvailableServiceSkusNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -90,8 +90,8 @@ export class ApiManagementServiceSkus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listAvailableServiceSkusOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/skus",
   urlParameters: [
@@ -116,7 +116,7 @@ const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listAvailableServiceSkusNextOperationSpec: msRest.OperationSpec = {
+const listAvailableServiceSkusNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
index 02d3a4495eeb..ddffaedd4f02 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiOperation {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiOperation {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,9 +219,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,7 +234,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -248,8 +248,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -275,9 +275,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -289,7 +289,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -323,19 +323,19 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -347,8 +347,8 @@ export class ApiOperation {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations",
   urlParameters: [
@@ -378,7 +378,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -433,7 +433,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -473,7 +473,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -506,7 +506,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -533,7 +533,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
index 7e7f6bd110f5..d88c547584b8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyListByOperationResponse>
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,7 +93,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -104,8 +104,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -150,8 +150,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -187,7 +187,7 @@ export class ApiOperationPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -199,8 +199,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class ApiOperationPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -239,7 +239,7 @@ export class ApiOperationPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -252,8 +252,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,8 +269,8 @@ export class ApiOperationPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies",
   urlParameters: [
@@ -297,7 +297,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -325,7 +325,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -355,7 +355,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -396,7 +396,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
index 4d5ddbc68485..bf30180cb129 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyListByApiResponse>
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ApiPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ApiPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ApiPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ApiPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
index 10e07fb486f2..4c89bf24cdf0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiProductMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiProduct {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiProduct {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiProduct {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiProductListByApisNextResponse>
    */
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
+  listByApisNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiProduct {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApisOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApisOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/products",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByApisOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApisNextOperationSpec: msRest.OperationSpec = {
+const listByApisNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
index f0d3cedeb6d3..5b56128c5d1a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiReleaseMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiRelease {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -51,8 +51,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -83,7 +83,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,8 +93,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -126,7 +126,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -136,8 +136,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,7 +171,7 @@ export class ApiRelease {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -182,8 +182,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -208,9 +208,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -235,8 +235,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,9 +261,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -274,7 +274,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -333,8 +333,8 @@ export class ApiRelease {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases",
   urlParameters: [
@@ -363,7 +363,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -390,7 +390,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -491,7 +491,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -518,7 +518,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
index 837ccbc609f9..7aefdbed97bf 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiRevisionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiRevision {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiRevision {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiRevision {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiRevisionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiRevision {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/revisions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
index da91eb979f4d..5ec72748bd7f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiSchemaMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiSchema {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiSchema {
    * @param parameters The schema contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,9 +218,9 @@ export class ApiSchema {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -232,7 +232,7 @@ export class ApiSchema {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,8 +245,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class ApiSchema {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas",
   urlParameters: [
@@ -320,7 +320,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -347,7 +347,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -375,7 +375,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -415,7 +415,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
index dd13e851c706..7a81f3426756 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiTagDescriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -44,7 +44,7 @@ export class ApiTagDescription {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -53,8 +53,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,7 +85,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,8 +95,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,7 +128,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -138,8 +138,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ApiTagDescription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -184,8 +184,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,9 +209,9 @@ export class ApiTagDescription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiTagDescription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -256,19 +256,19 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -280,8 +280,8 @@ export class ApiTagDescription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions",
   urlParameters: [
@@ -310,7 +310,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -365,7 +365,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -432,7 +432,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
index 5f6861172541..b1c965b849a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiVersionSetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class ApiVersionSet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class ApiVersionSet {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class ApiVersionSet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 8a3182d35653..26d8f5932dac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/authorizationServerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class AuthorizationServer {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class AuthorizationServer {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class AuthorizationServer {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..eb5e19210589 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/backendMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Backend {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetResponse>;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
+  get(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Backend {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Backend {
    * @param backendId Identifier of the Backend entity. Must be unique in the current API Management
    * service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<msRest.RestResponse>;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,19 +321,19 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -345,8 +345,8 @@ export class Backend {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends",
   urlParameters: [
@@ -374,7 +374,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -400,7 +400,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -427,7 +427,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -466,7 +466,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -498,7 +498,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -524,7 +524,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const reconnectOperationSpec: msRest.OperationSpec = {
+const reconnectOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}/reconnect",
   urlParameters: [
@@ -555,7 +555,7 @@ const reconnectOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..0229ff2d39ac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/cacheMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Cache {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetResponse>;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Cache {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Cache {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches",
   urlParameters: [
@@ -333,7 +333,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -359,7 +359,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -425,7 +425,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -457,7 +457,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -483,7 +483,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
index f47a28ce34f4..2cee16d8e3fe 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/certificateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Certificate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Certificate {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,9 +188,9 @@ export class Certificate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -200,7 +200,7 @@ export class Certificate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -211,8 +211,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -231,19 +231,19 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -255,8 +255,8 @@ export class Certificate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates",
   urlParameters: [
@@ -284,7 +284,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -310,7 +310,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -376,7 +376,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -402,7 +402,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
index e1289ca3ddd1..47fe7384cdb0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/delegationSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class DelegationSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class DelegationSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class DelegationSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class DelegationSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..c537d80aeea7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/diagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Diagnostic {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Diagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Diagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..feac8aa81707 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/emailTemplateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class EmailTemplate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,7 +73,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -87,7 +87,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -102,8 +102,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -130,7 +130,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -144,7 +144,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,8 +159,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class EmailTemplate {
    * @param parameters Email Template update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -219,8 +219,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -249,9 +249,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -268,7 +268,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -316,9 +316,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,7 +334,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -351,8 +351,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -371,19 +371,19 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -395,8 +395,8 @@ export class EmailTemplate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates",
   urlParameters: [
@@ -424,7 +424,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -477,7 +477,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -514,7 +514,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -546,7 +546,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -572,7 +572,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..f3e9fed92627 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Group {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetResponse>;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
+  get(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Group {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Group {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
index 819dff540d27..5a1f81e9495c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupUserMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
+  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -111,7 +111,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCreateResponse>
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,7 +119,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -149,9 +149,9 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,7 +159,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -168,8 +168,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,19 +188,19 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -212,8 +212,8 @@ export class GroupUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users",
   urlParameters: [
@@ -242,7 +242,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -268,7 +268,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOperationSpec: msRest.OperationSpec = {
+const createOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -298,7 +298,7 @@ const createOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -324,7 +324,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index a9dc72ce8502..6881b4086f45 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/identityProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class IdentityProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -282,19 +282,19 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -306,8 +306,8 @@ export class IdentityProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders",
   urlParameters: [
@@ -332,7 +332,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -358,7 +358,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -385,7 +385,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -424,7 +424,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -456,7 +456,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -482,7 +482,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
index 74263bc8328b..5bf06e0ce889 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/issueMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Issue {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueGetResponse>;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Issue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -100,19 +100,19 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -124,8 +124,8 @@ export class Issue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues",
   urlParameters: [
@@ -153,7 +153,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues/{issueId}",
   urlParameters: [
@@ -180,7 +180,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
index ceea06065217..d32282984e6c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/loggerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Logger {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Logger {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Logger {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -470,7 +470,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
index 4a2e2f094b53..2e3813915fc3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/networkStatusMappers";
 import * as Parameters from "../models/parameters";
@@ -35,21 +35,21 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByLocationResponse>
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class NetworkStatus {
    * Azure Regions like West US, East US, South Central US.
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class NetworkStatus {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContract>, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContract>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -103,8 +103,8 @@ export class NetworkStatus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/networkstatus",
   urlParameters: [
@@ -140,7 +140,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByLocationOperationSpec: msRest.OperationSpec = {
+const listByLocationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/locations/{locationName}/networkstatus",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
index ee40ffce7f34..de481b030736 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Notification {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -69,7 +69,7 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -90,8 +90,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -135,8 +135,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -154,19 +154,19 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -178,8 +178,8 @@ export class Notification {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications",
   urlParameters: [
@@ -206,7 +206,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -232,7 +232,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -259,7 +259,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
index 33904e45df9c..ebfd03f497fd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientEmailMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailCollection>, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailContract>, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailContract>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param email Email identifier.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientEmail {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
index 0f5df0fb3ac3..0cfc112d1d85 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientUserMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserCollection>, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserContract>, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserContract>, callback?: coreHttp.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
index 6b7772a13ea3..200f347aa0f1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/openIdConnectProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class OpenIdConnectProvider {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class OpenIdConnectProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class OpenIdConnectProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
index 770b86b58870..7338254dd123 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/operationOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class OperationOperations {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class OperationOperations {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class OperationOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.OperationListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class OperationOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operationsByTags",
   urlParameters: [
@@ -126,7 +126,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
index f9736328e80a..b9e89e968493 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policyMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,21 +66,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -104,15 +104,15 @@ export class Policy {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,7 +138,7 @@ export class Policy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -146,8 +146,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class Policy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -176,7 +176,7 @@ export class Policy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -185,8 +185,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,8 +200,8 @@ export class Policy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies",
   urlParameters: [
@@ -226,7 +226,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -252,7 +252,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -280,7 +280,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -319,7 +319,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
index d0ba7845bb1f..74b9659c45b9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policySnippetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class PolicySnippet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicySnippetsCollection>, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PolicySnippetsCollection>, callback?: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -60,8 +60,8 @@ export class PolicySnippet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policySnippets",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
index 31904c098334..173a8de78133 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetResponse>;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Product {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,15 +288,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -313,19 +313,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -341,19 +341,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -365,8 +365,8 @@ export class Product {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products",
   urlParameters: [
@@ -396,7 +396,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -422,7 +422,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -449,7 +449,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -488,7 +488,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -520,7 +520,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -547,7 +547,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/productsByTags",
   urlParameters: [
@@ -576,7 +576,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -597,7 +597,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
index c3bad7380501..29721dc07229 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productApiMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductApi {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,9 +74,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -178,7 +178,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -189,8 +189,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,19 +209,19 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -233,8 +233,8 @@ export class ProductApi {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis",
   urlParameters: [
@@ -263,7 +263,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -318,7 +318,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -344,7 +344,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
index d40911e555c8..67f7c51eda2e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductGroup {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,9 +73,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,7 +84,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,8 +94,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -127,7 +127,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -137,8 +137,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -159,9 +159,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -170,7 +170,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,19 +200,19 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -224,8 +224,8 @@ export class ProductGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups",
   urlParameters: [
@@ -254,7 +254,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -279,7 +279,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -309,7 +309,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -335,7 +335,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
index bd7e68b41ad9..a47a83954212 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyListByProductResponse>
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ProductPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ProductPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ProductPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ProductPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
index df3e0fbae8f6..78ae6452d116 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productSubscriptionsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductSubscriptions {
    * instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductSubscriptions {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class ProductSubscriptions {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductSubscriptionsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class ProductSubscriptions {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/subscriptions",
   urlParameters: [
@@ -125,7 +125,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
index af83fe7a925d..432482302489 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/propertyMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Property {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Property {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Property {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
index e4976fa216f6..06ca471204a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByCounterKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class QuotaByCounterKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByCounterKeysListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterCollection>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,9 +83,9 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,7 +96,7 @@ export class QuotaByCounterKeys {
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -108,8 +108,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class QuotaByCounterKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
@@ -151,7 +151,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..41f8e762396b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByPeriodKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -39,7 +39,7 @@ export class QuotaByPeriodKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByPeriodKeysGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -50,7 +50,7 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -62,8 +62,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterContract>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -87,9 +87,9 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -101,7 +101,7 @@ export class QuotaByPeriodKeys {
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,8 +114,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,8 +131,8 @@ export class QuotaByPeriodKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
@@ -159,7 +159,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
index a563773df876..12217e5f5dd2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/regionMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class Region {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/regions",
   urlParameters: [
@@ -114,7 +114,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
index 328d1f592dab..2f5ab070e0e2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/reportsMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class Reports {
    * @param filter The filter to apply on the operation.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -101,7 +101,7 @@ export class Reports {
    * | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -121,8 +121,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -193,8 +193,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -243,7 +243,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -314,7 +314,7 @@ export class Reports {
    * | </br>
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,8 +334,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -384,7 +384,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -403,8 +403,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -461,7 +461,7 @@ export class Reports {
    * TimeSpan(hours, minutes, seconds)).
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -484,8 +484,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -521,7 +521,7 @@ export class Reports {
    * filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -533,8 +533,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | msRest.ServiceCallback<Models.RequestReportCollection>, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | coreHttp.ServiceCallback<Models.RequestReportCollection>, callback?: coreHttp.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -552,19 +552,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -580,19 +580,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByUserNextResponse>
    */
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
+  listByUserNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -608,19 +608,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -636,19 +636,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -664,19 +664,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByGeoNextResponse>
    */
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
+  listByGeoNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -692,19 +692,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListBySubscriptionNextResponse>
    */
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
+  listBySubscriptionNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -720,19 +720,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByTimeNextResponse>
    */
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
+  listByTimeNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -744,8 +744,8 @@ export class Reports {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byApi",
   urlParameters: [
@@ -774,7 +774,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserOperationSpec: msRest.OperationSpec = {
+const listByUserOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byUser",
   urlParameters: [
@@ -803,7 +803,7 @@ const listByUserOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byOperation",
   urlParameters: [
@@ -832,7 +832,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byProduct",
   urlParameters: [
@@ -861,7 +861,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoOperationSpec: msRest.OperationSpec = {
+const listByGeoOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byGeo",
   urlParameters: [
@@ -889,7 +889,7 @@ const listByGeoOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/bySubscription",
   urlParameters: [
@@ -918,7 +918,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeOperationSpec: msRest.OperationSpec = {
+const listByTimeOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byTime",
   urlParameters: [
@@ -948,7 +948,7 @@ const listByTimeOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByRequestOperationSpec: msRest.OperationSpec = {
+const listByRequestOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byRequest",
   urlParameters: [
@@ -976,7 +976,7 @@ const listByRequestOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -997,7 +997,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserNextOperationSpec: msRest.OperationSpec = {
+const listByUserNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1018,7 +1018,7 @@ const listByUserNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1039,7 +1039,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1060,7 +1060,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoNextOperationSpec: msRest.OperationSpec = {
+const listByGeoNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1081,7 +1081,7 @@ const listByGeoNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1102,7 +1102,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeNextOperationSpec: msRest.OperationSpec = {
+const listByTimeNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
index dd971ea317b3..aa821fe29d3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signInSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignInSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignInSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignInSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignInSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
index bd3214a4dffd..036908e63887 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signUpSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignUpSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignUpSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignUpSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignUpSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
index 630cfbf109fc..c665a6438d1f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/subscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Subscription {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class Subscription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -322,9 +322,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -332,7 +332,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -341,8 +341,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -360,19 +360,19 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -384,8 +384,8 @@ export class Subscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions",
   urlParameters: [
@@ -413,7 +413,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -439,7 +439,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -466,7 +466,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -506,7 +506,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -539,7 +539,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -565,7 +565,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regeneratePrimaryKey",
   urlParameters: [
@@ -589,7 +589,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regenerateSecondaryKey",
   urlParameters: [
@@ -613,7 +613,7 @@ const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..b8b1bf0c9d72 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagMappers";
 import * as Parameters from "../models/parameters";
@@ -47,7 +47,7 @@ export class Tag {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -84,7 +84,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByOperationResponse>
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,7 +95,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -107,8 +107,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -134,7 +134,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByOperationResponse>
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -145,7 +145,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -157,8 +157,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -184,7 +184,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToOperationResponse>
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -195,7 +195,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,8 +207,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -232,9 +232,9 @@ export class Tag {
    * Management service instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,7 +245,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -257,8 +257,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -289,7 +289,7 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -298,8 +298,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,7 +321,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByApiResponse>
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -330,7 +330,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -340,8 +340,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -364,7 +364,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByApiResponse>
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -373,7 +373,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -383,8 +383,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -407,7 +407,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToApiResponse>
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -416,7 +416,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -426,8 +426,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -448,9 +448,9 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -459,7 +459,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -469,8 +469,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -500,7 +500,7 @@ export class Tag {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -509,8 +509,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -532,7 +532,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByProductResponse>
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -541,7 +541,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -551,8 +551,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -575,7 +575,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByProductResponse>
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -584,7 +584,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -594,8 +594,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -618,7 +618,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToProductResponse>
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -627,7 +627,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -637,8 +637,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -659,9 +659,9 @@ export class Tag {
    * instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -670,7 +670,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -680,8 +680,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -707,15 +707,15 @@ export class Tag {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -734,14 +734,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateResponse>
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -749,8 +749,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -770,14 +770,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetResponse>;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -785,8 +785,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
+  get(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -815,7 +815,7 @@ export class Tag {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -824,8 +824,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -847,9 +847,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -859,7 +859,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -870,8 +870,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -893,9 +893,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -904,7 +904,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -914,8 +914,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -934,19 +934,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -962,19 +962,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -990,19 +990,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1018,19 +1018,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1042,8 +1042,8 @@ export class Tag {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags",
   urlParameters: [
@@ -1073,7 +1073,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
+const getEntityStateByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1101,7 +1101,7 @@ const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByOperationOperationSpec: msRest.OperationSpec = {
+const getByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1130,7 +1130,7 @@ const getByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToOperationOperationSpec: msRest.OperationSpec = {
+const assignToOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1161,7 +1161,7 @@ const assignToOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromOperationOperationSpec: msRest.OperationSpec = {
+const detachFromOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1188,7 +1188,7 @@ const detachFromOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiOperationSpec: msRest.OperationSpec = {
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags",
   urlParameters: [
@@ -1217,7 +1217,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
+const getEntityStateByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1244,7 +1244,7 @@ const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByApiOperationSpec: msRest.OperationSpec = {
+const getByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1272,7 +1272,7 @@ const getByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToApiOperationSpec: msRest.OperationSpec = {
+const assignToApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1304,7 +1304,7 @@ const assignToApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromApiOperationSpec: msRest.OperationSpec = {
+const detachFromApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1330,7 +1330,7 @@ const detachFromApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags",
   urlParameters: [
@@ -1359,7 +1359,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
+const getEntityStateByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1386,7 +1386,7 @@ const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByProductOperationSpec: msRest.OperationSpec = {
+const getByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1414,7 +1414,7 @@ const getByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToProductOperationSpec: msRest.OperationSpec = {
+const assignToProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1444,7 +1444,7 @@ const assignToProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromProductOperationSpec: msRest.OperationSpec = {
+const detachFromProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1470,7 +1470,7 @@ const detachFromProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags",
   urlParameters: [
@@ -1499,7 +1499,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateOperationSpec: msRest.OperationSpec = {
+const getEntityStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1525,7 +1525,7 @@ const getEntityStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1552,7 +1552,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1591,7 +1591,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1623,7 +1623,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1649,7 +1649,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1670,7 +1670,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1691,7 +1691,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1712,7 +1712,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
index b662081c7fcb..174b64c28bd7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagResourceMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class TagResource {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class TagResource {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagResourceListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class TagResource {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tagResources",
   urlParameters: [
@@ -117,7 +117,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index 79018f752dfd..f4a53f233db4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class TenantAccess {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class TenantAccess {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class TenantAccess {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,23 +138,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -170,23 +170,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -199,8 +199,8 @@ export class TenantAccess {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -226,7 +226,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -253,7 +253,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -285,7 +285,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regeneratePrimaryKey",
   urlParameters: [
@@ -309,7 +309,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
index c7fbd0f24509..f29079060881 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessGitMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccessGit {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGitGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,23 +63,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -95,23 +95,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class TenantAccessGit {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git",
   urlParameters: [
@@ -152,7 +152,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regeneratePrimaryKey",
   urlParameters: [
@@ -176,7 +176,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
index be1e84173988..fefb4e8f6dd4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantConfigurationMappers";
 import * as Parameters from "../models/parameters";
@@ -36,7 +36,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationDeployResponse>
    */
-  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
+  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
     return this.beginDeploy(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationDeployResponse>;
   }
@@ -50,7 +50,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationSaveResponse>
    */
-  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
+  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
     return this.beginSave(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationSaveResponse>;
   }
@@ -64,7 +64,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationValidateResponse>
    */
-  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
+  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
     return this.beginValidate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationValidateResponse>;
   }
@@ -77,21 +77,21 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationGetSyncStateResponse>
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
+  getSyncState(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -109,9 +109,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Deploy Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -130,9 +130,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Save Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -151,9 +151,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Validate Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -167,8 +167,8 @@ export class TenantConfiguration {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getSyncStateOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getSyncStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/syncState",
   urlParameters: [
@@ -194,7 +194,7 @@ const getSyncStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeployOperationSpec: msRest.OperationSpec = {
+const beginDeployOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/deploy",
   urlParameters: [
@@ -228,7 +228,7 @@ const beginDeployOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginSaveOperationSpec: msRest.OperationSpec = {
+const beginSaveOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/save",
   urlParameters: [
@@ -262,7 +262,7 @@ const beginSaveOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginValidateOperationSpec: msRest.OperationSpec = {
+const beginValidateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/validate",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
index 43a8c279ccc7..3ea13cf17f4d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class User {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetResponse>;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
+  get(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class User {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,14 +269,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGenerateSsoUrlResponse>
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -306,7 +306,7 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetSharedAccessTokenResponse>
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -314,7 +314,7 @@ export class User {
    * @param parameters Create Authorization Token parameters.
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -323,8 +323,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserTokenResult>, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserTokenResult>, callback?: coreHttp.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -343,19 +343,19 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -367,8 +367,8 @@ export class User {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users",
   urlParameters: [
@@ -397,7 +397,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -423,7 +423,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -489,7 +489,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -521,7 +521,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -549,7 +549,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const generateSsoUrlOperationSpec: msRest.OperationSpec = {
+const generateSsoUrlOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl",
   urlParameters: [
@@ -575,7 +575,7 @@ const generateSsoUrlOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
+const getSharedAccessTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token",
   urlParameters: [
@@ -608,7 +608,7 @@ const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
index d9e3dbdaf146..a89f508bb26c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Mappers from "../models/userConfirmationPasswordMappers";
 import * as Parameters from "../models/parameters";
 import { ApiManagementClientContext } from "../apiManagementClientContext";
@@ -31,16 +31,16 @@ export class UserConfirmationPassword {
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,8 +48,8 @@ export class UserConfirmationPassword {
    * @param options The optional parameters
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  send(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,8 +63,8 @@ export class UserConfirmationPassword {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const sendOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const sendOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/confirmations/password/send",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
index 0387dbc52c58..2458f939727f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserGroup {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGroupListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/groups",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
index e84a1e21f620..292ac034ceb2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userIdentitiesMappers";
 import * as Parameters from "../models/parameters";
@@ -34,14 +34,14 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListResponse>
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserIdentities {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserIdentities {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/identities",
   urlParameters: [
@@ -119,7 +119,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
index bf8816577ff9..c75728d78f8f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userSubscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserSubscription {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserSubscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserSubscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserSubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserSubscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",

From 13814dafc82210128e2830a6bf8974a83a6d43bc Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:02:57 +0000
Subject: [PATCH 21/24] Generated from 1f1421f9fdbf67ac8c1ac7f540346d3e98eef77e
 (#4431)

remove x-ms-odata
---
 sdk/apimanagement/arm-apimanagement/README.md |  10 +-
 .../arm-apimanagement/package.json            |  10 +-
 .../arm-apimanagement/rollup.config.js        |   8 +-
 .../src/apiManagementClient.ts                |   4 +-
 .../src/apiManagementClientContext.ts         |  12 +-
 .../arm-apimanagement/src/models/index.ts     | 810 ++++++++++--------
 .../arm-apimanagement/src/models/mappers.ts   | 588 ++++++-------
 .../src/models/parameters.ts                  | 144 ++--
 .../arm-apimanagement/src/operations/api.ts   |  92 +-
 .../src/operations/apiDiagnostic.ts           |  74 +-
 .../src/operations/apiExport.ts               |  14 +-
 .../src/operations/apiIssue.ts                |  72 +-
 .../src/operations/apiIssueAttachment.ts      |  62 +-
 .../src/operations/apiIssueComment.ts         |  62 +-
 .../src/operations/apiManagementOperations.ts |  24 +-
 .../src/operations/apiManagementService.ts    | 122 +--
 .../operations/apiManagementServiceSkus.ts    |  24 +-
 .../src/operations/apiOperation.ts            |  74 +-
 .../src/operations/apiOperationPolicy.ts      |  52 +-
 .../src/operations/apiPolicy.ts               |  52 +-
 .../src/operations/apiProduct.ts              |  22 +-
 .../src/operations/apiRelease.ts              |  74 +-
 .../src/operations/apiRevision.ts             |  22 +-
 .../src/operations/apiSchema.ts               |  62 +-
 .../src/operations/apiTagDescription.ts       |  62 +-
 .../src/operations/apiVersionSet.ts           |  74 +-
 .../src/operations/authorizationServer.ts     |  74 +-
 .../src/operations/backend.ts                 |  86 +-
 .../arm-apimanagement/src/operations/cache.ts |  74 +-
 .../src/operations/certificate.ts             |  62 +-
 .../src/operations/delegationSettings.ts      |  44 +-
 .../src/operations/diagnostic.ts              |  74 +-
 .../src/operations/emailTemplate.ts           |  74 +-
 .../arm-apimanagement/src/operations/group.ts |  74 +-
 .../src/operations/groupUser.ts               |  54 +-
 .../src/operations/identityProvider.ts        |  76 +-
 .../arm-apimanagement/src/operations/issue.ts |  32 +-
 .../src/operations/logger.ts                  |  74 +-
 .../src/operations/networkStatus.ts           |  24 +-
 .../src/operations/notification.ts            |  40 +-
 .../operations/notificationRecipientEmail.ts  |  46 +-
 .../operations/notificationRecipientUser.ts   |  46 +-
 .../src/operations/openIdConnectProvider.ts   |  74 +-
 .../src/operations/operationOperations.ts     |  22 +-
 .../src/operations/policy.ts                  |  52 +-
 .../src/operations/policySnippet.ts           |  12 +-
 .../src/operations/product.ts                 |  92 +-
 .../src/operations/productApi.ts              |  56 +-
 .../src/operations/productGroup.ts            |  56 +-
 .../src/operations/productPolicy.ts           |  52 +-
 .../src/operations/productSubscriptions.ts    |  22 +-
 .../src/operations/property.ts                |  74 +-
 .../src/operations/quotaByCounterKeys.ts      |  26 +-
 .../src/operations/quotaByPeriodKeys.ts       |  26 +-
 .../src/operations/region.ts                  |  24 +-
 .../src/operations/reports.ts                 | 138 +--
 .../src/operations/signInSettings.ts          |  44 +-
 .../src/operations/signUpSettings.ts          |  44 +-
 .../src/operations/subscription.ts            |  98 +--
 .../arm-apimanagement/src/operations/tag.ts   | 254 +++---
 .../src/operations/tagResource.ts             |  22 +-
 .../src/operations/tenantAccess.ts            |  60 +-
 .../src/operations/tenantAccessGit.ts         |  38 +-
 .../src/operations/tenantConfiguration.ts     |  40 +-
 .../arm-apimanagement/src/operations/user.ts  |  94 +-
 .../operations/userConfirmationPassword.ts    |  16 +-
 .../src/operations/userGroup.ts               |  22 +-
 .../src/operations/userIdentities.ts          |  24 +-
 .../src/operations/userSubscription.ts        |  22 +-
 69 files changed, 2567 insertions(+), 2517 deletions(-)

diff --git a/sdk/apimanagement/arm-apimanagement/README.md b/sdk/apimanagement/arm-apimanagement/README.md
index 862f3d10a47b..7abcc247b997 100644
--- a/sdk/apimanagement/arm-apimanagement/README.md
+++ b/sdk/apimanagement/arm-apimanagement/README.md
@@ -26,8 +26,8 @@ npm install @azure/ms-rest-nodeauth
 ##### Sample code
 
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
 import { ApiManagementClient, ApiManagementModels, ApiManagementMappers } from "@azure/arm-apimanagement";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
@@ -68,8 +68,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 <html lang="en">
   <head>
     <title>@azure/arm-apimanagement sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/@azure/core-http/dist/coreHttp.browser.js"></script>
+    <script src="node_modules/@azure/core-arm/dist/coreArm.js"></script>
     <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/arm-apimanagement/dist/arm-apimanagement.js"></script>
     <script type="text/javascript">
@@ -108,3 +108,5 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 ## Related projects
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/apimanagement/arm-apimanagement/README.png)
diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index 3dc6a1e94b14..b3a26bfc5de1 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -4,8 +4,8 @@
   "description": "ApiManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.8.1",
+    "@azure/core-arm": "^1.0.0-preview.1",
+    "@azure/core-http": "^1.0.0-preview.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -26,13 +26,13 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/apimanagement/arm-apimanagement",
   "repository": {
     "type": "git",
-    "url": "https://github.com/azure/azure-sdk-for-js.git"
+    "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
   "bugs": {
-    "url": "https://github.com/azure/azure-sdk-for-js/issues"
+    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
   },
   "files": [
     "dist/**/*.js",
diff --git a/sdk/apimanagement/arm-apimanagement/rollup.config.js b/sdk/apimanagement/arm-apimanagement/rollup.config.js
index dc0dc5622703..90edb8e8a3ff 100644
--- a/sdk/apimanagement/arm-apimanagement/rollup.config.js
+++ b/sdk/apimanagement/arm-apimanagement/rollup.config.js
@@ -8,8 +8,8 @@ import sourcemaps from "rollup-plugin-sourcemaps";
 const config = {
   input: "./esm/apiManagementClient.js",
   external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
+    "@azure/core-http",
+    "@azure/core-arm"
   ],
   output: {
     file: "./dist/arm-apimanagement.js",
@@ -17,8 +17,8 @@ const config = {
     name: "Azure.ArmApimanagement",
     sourcemap: true,
     globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
+      "@azure/core-http": "coreHttp",
+      "@azure/core-arm": "coreArm"
     },
     banner: `/*
  * Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
index 454cda6b424c..3a64af8ce303 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
@@ -86,7 +86,7 @@ class ApiManagementClient extends ApiManagementClientContext {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     super(credentials, subscriptionId, options);
     this.api = new operations.Api(this);
     this.apiRevision = new operations.ApiRevision(this);
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index 0a2d57d4bcfe..220b849ff8d9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -9,14 +9,14 @@
  */
 
 import * as Models from "./models";
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 
 const packageName = "@azure/arm-apimanagement";
 const packageVersion = "5.1.0";
 
-export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
-  credentials: msRest.ServiceClientCredentials;
+export class ApiManagementClientContext extends coreArm.AzureServiceClient {
+  credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials;
   apiVersion?: string;
   subscriptionId: string;
 
@@ -27,7 +27,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
@@ -39,7 +39,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
       options = {};
     }
     if(!options.userAgent) {
-      const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
+      const defaultUserAgent = coreArm.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index f91afeb3611d..27473a3b8b3e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -6,8 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export { BaseResource, CloudError };
 
@@ -2355,13 +2355,31 @@ export interface ApiManagementServiceBaseProperties {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2505,13 +2523,31 @@ export interface ApiManagementServiceResource extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2639,13 +2675,31 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -4407,7 +4461,7 @@ export interface QuotaCounterValueContract {
 /**
  * Optional Parameters.
  */
-export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4440,7 +4494,7 @@ export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4451,7 +4505,7 @@ export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete all revisions of the Api.
    */
@@ -4461,7 +4515,7 @@ export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase
 /**
  * Optional Parameters.
  */
-export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * | Field       | Supported operators    | Supported functions               |
    * |-------------|------------------------|-----------------------------------|
@@ -4492,7 +4546,7 @@ export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiBeginCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4503,7 +4557,7 @@ export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiRevisionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter |
@@ -4523,7 +4577,7 @@ export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le,
@@ -4543,7 +4597,7 @@ export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4554,7 +4608,7 @@ export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4583,7 +4637,7 @@ export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4594,7 +4648,7 @@ export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4604,7 +4658,7 @@ export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4615,7 +4669,7 @@ export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface TagListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4636,7 +4690,7 @@ export interface TagListByOperationOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4657,7 +4711,7 @@ export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface TagListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4678,7 +4732,7 @@ export interface TagListByProductOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4703,7 +4757,7 @@ export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface TagCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4714,7 +4768,7 @@ export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiProductListByApisOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiProductListByApisOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4734,7 +4788,7 @@ export interface ApiProductListByApisOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4744,7 +4798,7 @@ export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4755,7 +4809,7 @@ export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter |
@@ -4775,7 +4829,7 @@ export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4786,7 +4840,7 @@ export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * If true removes all references to the schema before deleting it.
    */
@@ -4796,7 +4850,7 @@ export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4816,7 +4870,7 @@ export interface ApiDiagnosticListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4827,7 +4881,7 @@ export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4853,7 +4907,7 @@ export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Expand the comment attachments.
    */
@@ -4863,7 +4917,7 @@ export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4874,7 +4928,7 @@ export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4895,7 +4949,7 @@ export interface ApiIssueCommentListByServiceOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4906,7 +4960,7 @@ export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.Requ
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4927,7 +4981,7 @@ export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4938,7 +4992,7 @@ export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4959,7 +5013,7 @@ export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4970,7 +5024,7 @@ export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface OperationListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface OperationListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5000,7 +5054,7 @@ export interface OperationListByTagsOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>
@@ -5019,7 +5073,7 @@ export interface ApiVersionSetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5030,7 +5084,7 @@ export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5051,7 +5105,7 @@ export interface AuthorizationServerListByServiceOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5062,7 +5116,7 @@ export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.
 /**
  * Optional Parameters.
  */
-export interface BackendListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5084,7 +5138,7 @@ export interface BackendListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5095,7 +5149,7 @@ export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendReconnectOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Reconnect request parameters.
    */
@@ -5105,7 +5159,7 @@ export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5119,7 +5173,7 @@ export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5130,7 +5184,7 @@ export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface CertificateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5153,7 +5207,7 @@ export interface CertificateListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5164,7 +5218,7 @@ export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5176,7 +5230,7 @@ export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalPar
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5188,7 +5242,7 @@ export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOption
 /**
  * Optional Parameters.
  */
-export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5208,7 +5262,7 @@ export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5219,7 +5273,7 @@ export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5239,7 +5293,7 @@ export interface EmailTemplateListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5250,7 +5304,7 @@ export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5273,7 +5327,7 @@ export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5284,7 +5338,7 @@ export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupUserListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5309,7 +5363,7 @@ export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface IdentityProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5320,7 +5374,7 @@ export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface IssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5345,7 +5399,7 @@ export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface LoggerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5368,7 +5422,7 @@ export interface LoggerListByServiceOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5379,7 +5433,7 @@ export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Force deletion even if diagnostic is attached.
    */
@@ -5389,7 +5443,7 @@ export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface NotificationListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5403,7 +5457,7 @@ export interface NotificationListByServiceOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface NotificationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5414,7 +5468,7 @@ export interface NotificationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5435,7 +5489,7 @@ export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5446,7 +5500,7 @@ export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRes
 /**
  * Optional Parameters.
  */
-export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5456,7 +5510,7 @@ export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5467,7 +5521,7 @@ export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface PolicySnippetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicySnippetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy scope. Possible values include: 'Tenant', 'Product', 'Api', 'Operation', 'All'
    */
@@ -5477,7 +5531,7 @@ export interface PolicySnippetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignInSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5488,7 +5542,7 @@ export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignUpSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5499,7 +5553,7 @@ export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DelegationSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5510,7 +5564,7 @@ export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ProductListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5543,7 +5597,7 @@ export interface ProductListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5554,7 +5608,7 @@ export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete existing subscriptions associated with the product or not.
    */
@@ -5564,7 +5618,7 @@ export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5592,7 +5646,7 @@ export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ProductApiListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductApiListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5617,7 +5671,7 @@ export interface ProductApiListByProductOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ProductGroupListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductGroupListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5638,7 +5692,7 @@ export interface ProductGroupListByProductOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductSubscriptionsListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5665,7 +5719,7 @@ export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5675,7 +5729,7 @@ export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5686,7 +5740,7 @@ export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface PropertyListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le,
@@ -5707,7 +5761,7 @@ export interface PropertyListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5718,7 +5772,7 @@ export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5736,7 +5790,7 @@ export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByUserOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5754,7 +5808,7 @@ export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5772,7 +5826,7 @@ export interface ReportsListByOperationOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5790,7 +5844,7 @@ export interface ReportsListByProductOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByGeoOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5804,7 +5858,7 @@ export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListBySubscriptionOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5822,7 +5876,7 @@ export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByTimeOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5840,7 +5894,7 @@ export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByRequestOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByRequestOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5854,7 +5908,7 @@ export interface ReportsListByRequestOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5881,7 +5935,7 @@ export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5898,7 +5952,7 @@ export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5910,7 +5964,7 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagResourceListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagResourceListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le,
@@ -5942,7 +5996,7 @@ export interface TagResourceListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface UserListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5972,7 +6026,7 @@ export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface UserCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5983,7 +6037,7 @@ export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface UserDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Whether to delete user's subscription or not.
    */
@@ -5997,7 +6051,7 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserGroupListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -6019,7 +6073,7 @@ export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface UserSubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserSubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -7943,7 +7997,7 @@ export type ApiListByServiceResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -7963,7 +8017,7 @@ export type ApiGetEntityTagResponse = ApiGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -7978,7 +8032,7 @@ export type ApiGetResponse = ApiContract & ApiGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8003,7 +8057,7 @@ export type ApiCreateOrUpdateResponse = ApiContract & ApiCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8028,7 +8082,7 @@ export type ApiListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8048,7 +8102,7 @@ export type ApiListByServiceNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8068,7 +8122,7 @@ export type ApiListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8088,7 +8142,7 @@ export type ApiRevisionListByServiceResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8108,7 +8162,7 @@ export type ApiRevisionListByServiceNextResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8128,7 +8182,7 @@ export type ApiReleaseListByServiceResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8148,7 +8202,7 @@ export type ApiReleaseGetEntityTagResponse = ApiReleaseGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8163,7 +8217,7 @@ export type ApiReleaseGetResponse = ApiReleaseContract & ApiReleaseGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8188,7 +8242,7 @@ export type ApiReleaseCreateOrUpdateResponse = ApiReleaseContract & ApiReleaseCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8213,7 +8267,7 @@ export type ApiReleaseListByServiceNextResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8233,7 +8287,7 @@ export type ApiOperationListByApiResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8253,7 +8307,7 @@ export type ApiOperationGetEntityTagResponse = ApiOperationGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8268,7 +8322,7 @@ export type ApiOperationGetResponse = OperationContract & ApiOperationGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8293,7 +8347,7 @@ export type ApiOperationCreateOrUpdateResponse = OperationContract & ApiOperatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8318,7 +8372,7 @@ export type ApiOperationListByApiNextResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8338,7 +8392,7 @@ export type ApiOperationPolicyListByOperationResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8358,7 +8412,7 @@ export type ApiOperationPolicyGetEntityTagResponse = ApiOperationPolicyGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8373,7 +8427,7 @@ export type ApiOperationPolicyGetResponse = PolicyContract & ApiOperationPolicyG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8398,7 +8452,7 @@ export type ApiOperationPolicyCreateOrUpdateResponse = PolicyContract & ApiOpera
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8423,7 +8477,7 @@ export type TagListByOperationResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8443,7 +8497,7 @@ export type TagGetEntityStateByOperationResponse = TagGetEntityStateByOperationH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8458,7 +8512,7 @@ export type TagGetByOperationResponse = TagContract & TagGetByOperationHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8483,7 +8537,7 @@ export type TagAssignToOperationResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8503,7 +8557,7 @@ export type TagListByApiResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8523,7 +8577,7 @@ export type TagGetEntityStateByApiResponse = TagGetEntityStateByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8538,7 +8592,7 @@ export type TagGetByApiResponse = TagContract & TagGetByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8563,7 +8617,7 @@ export type TagAssignToApiResponse = TagContract & TagAssignToApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8588,7 +8642,7 @@ export type TagListByProductResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8608,7 +8662,7 @@ export type TagGetEntityStateByProductResponse = TagGetEntityStateByProductHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8623,7 +8677,7 @@ export type TagGetByProductResponse = TagContract & TagGetByProductHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8648,7 +8702,7 @@ export type TagAssignToProductResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8668,7 +8722,7 @@ export type TagListByServiceResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8688,7 +8742,7 @@ export type TagGetEntityStateResponse = TagGetEntityStateHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8703,7 +8757,7 @@ export type TagGetResponse = TagContract & TagGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8728,7 +8782,7 @@ export type TagCreateOrUpdateResponse = TagContract & TagCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8753,7 +8807,7 @@ export type TagListByOperationNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8773,7 +8827,7 @@ export type TagListByApiNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8793,7 +8847,7 @@ export type TagListByProductNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8813,7 +8867,7 @@ export type TagListByServiceNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8833,7 +8887,7 @@ export type ApiProductListByApisResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8853,7 +8907,7 @@ export type ApiProductListByApisNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8873,7 +8927,7 @@ export type ApiPolicyListByApiResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8893,7 +8947,7 @@ export type ApiPolicyGetEntityTagResponse = ApiPolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8908,7 +8962,7 @@ export type ApiPolicyGetResponse = PolicyContract & ApiPolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8933,7 +8987,7 @@ export type ApiPolicyCreateOrUpdateResponse = PolicyContract & ApiPolicyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8958,7 +9012,7 @@ export type ApiSchemaListByApiResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8978,7 +9032,7 @@ export type ApiSchemaGetEntityTagResponse = ApiSchemaGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8993,7 +9047,7 @@ export type ApiSchemaGetResponse = SchemaContract & ApiSchemaGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9018,7 +9072,7 @@ export type ApiSchemaCreateOrUpdateResponse = SchemaContract & ApiSchemaCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9043,7 +9097,7 @@ export type ApiSchemaListByApiNextResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9063,7 +9117,7 @@ export type ApiDiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9083,7 +9137,7 @@ export type ApiDiagnosticGetEntityTagResponse = ApiDiagnosticGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9098,7 +9152,7 @@ export type ApiDiagnosticGetResponse = DiagnosticContract & ApiDiagnosticGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9123,7 +9177,7 @@ export type ApiDiagnosticCreateOrUpdateResponse = DiagnosticContract & ApiDiagno
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9148,7 +9202,7 @@ export type ApiDiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9168,7 +9222,7 @@ export type ApiIssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9188,7 +9242,7 @@ export type ApiIssueGetEntityTagResponse = ApiIssueGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9203,7 +9257,7 @@ export type ApiIssueGetResponse = IssueContract & ApiIssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9228,7 +9282,7 @@ export type ApiIssueCreateOrUpdateResponse = IssueContract & ApiIssueCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9253,7 +9307,7 @@ export type ApiIssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9273,7 +9327,7 @@ export type ApiIssueCommentListByServiceResponse = IssueCommentCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9293,7 +9347,7 @@ export type ApiIssueCommentGetEntityTagResponse = ApiIssueCommentGetEntityTagHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9308,7 +9362,7 @@ export type ApiIssueCommentGetResponse = IssueCommentContract & ApiIssueCommentG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9333,7 +9387,7 @@ export type ApiIssueCommentCreateOrUpdateResponse = IssueCommentContract & ApiIs
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9358,7 +9412,7 @@ export type ApiIssueCommentListByServiceNextResponse = IssueCommentCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9378,7 +9432,7 @@ export type ApiIssueAttachmentListByServiceResponse = IssueAttachmentCollection
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9398,7 +9452,7 @@ export type ApiIssueAttachmentGetEntityTagResponse = ApiIssueAttachmentGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9413,7 +9467,7 @@ export type ApiIssueAttachmentGetResponse = IssueAttachmentContract & ApiIssueAt
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9438,7 +9492,7 @@ export type ApiIssueAttachmentCreateOrUpdateResponse = IssueAttachmentContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9463,7 +9517,7 @@ export type ApiIssueAttachmentListByServiceNextResponse = IssueAttachmentCollect
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9483,7 +9537,7 @@ export type ApiTagDescriptionListByServiceResponse = TagDescriptionCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9503,7 +9557,7 @@ export type ApiTagDescriptionGetEntityTagResponse = ApiTagDescriptionGetEntityTa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9518,7 +9572,7 @@ export type ApiTagDescriptionGetResponse = TagDescriptionContract & ApiTagDescri
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9543,7 +9597,7 @@ export type ApiTagDescriptionCreateOrUpdateResponse = TagDescriptionContract & A
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9568,7 +9622,7 @@ export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollectio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9588,7 +9642,7 @@ export type OperationListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9608,7 +9662,7 @@ export type OperationListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9628,7 +9682,7 @@ export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9648,7 +9702,7 @@ export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9663,7 +9717,7 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9688,7 +9742,7 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9713,7 +9767,7 @@ export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9733,7 +9787,7 @@ export type AuthorizationServerListByServiceResponse = AuthorizationServerCollec
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9753,7 +9807,7 @@ export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEnti
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9768,7 +9822,7 @@ export type AuthorizationServerGetResponse = AuthorizationServerContract & Autho
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9793,7 +9847,7 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9818,7 +9872,7 @@ export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9838,7 +9892,7 @@ export type BackendListByServiceResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9858,7 +9912,7 @@ export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9873,7 +9927,7 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9898,7 +9952,7 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9923,7 +9977,7 @@ export type BackendListByServiceNextResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9943,7 +9997,7 @@ export type CacheListByServiceResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9963,7 +10017,7 @@ export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9978,7 +10032,7 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10003,7 +10057,7 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10028,7 +10082,7 @@ export type CacheListByServiceNextResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10048,7 +10102,7 @@ export type CertificateListByServiceResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10068,7 +10122,7 @@ export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10083,7 +10137,7 @@ export type CertificateGetResponse = CertificateContract & CertificateGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10108,7 +10162,7 @@ export type CertificateCreateOrUpdateResponse = CertificateContract & Certificat
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10133,7 +10187,7 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10153,7 +10207,7 @@ export type ApiManagementOperationsListResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10173,7 +10227,7 @@ export type ApiManagementOperationsListNextResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10193,7 +10247,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusResponse = ResourceS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10213,7 +10267,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusNextResponse = Resou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10233,7 +10287,7 @@ export type ApiManagementServiceRestoreResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10253,7 +10307,7 @@ export type ApiManagementServiceBackupResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10273,7 +10327,7 @@ export type ApiManagementServiceCreateOrUpdateResponse = ApiManagementServiceRes
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10293,7 +10347,7 @@ export type ApiManagementServiceUpdateResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10313,7 +10367,7 @@ export type ApiManagementServiceGetResponse = ApiManagementServiceResource & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10333,7 +10387,7 @@ export type ApiManagementServiceDeleteMethodResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10353,7 +10407,7 @@ export type ApiManagementServiceListByResourceGroupResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10373,7 +10427,7 @@ export type ApiManagementServiceListResponse = ApiManagementServiceListResult &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10393,7 +10447,7 @@ export type ApiManagementServiceGetSsoTokenResponse = ApiManagementServiceGetSso
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10413,7 +10467,7 @@ export type ApiManagementServiceCheckNameAvailabilityResponse = ApiManagementSer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10433,7 +10487,7 @@ export type ApiManagementServiceApplyNetworkConfigurationUpdatesResponse = ApiMa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10453,7 +10507,7 @@ export type ApiManagementServiceBeginRestoreResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10473,7 +10527,7 @@ export type ApiManagementServiceBeginBackupResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10493,7 +10547,7 @@ export type ApiManagementServiceBeginCreateOrUpdateResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10513,7 +10567,7 @@ export type ApiManagementServiceBeginUpdateResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10533,7 +10587,7 @@ export type ApiManagementServiceBeginDeleteMethodResponse = ApiManagementService
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10553,7 +10607,7 @@ export type ApiManagementServiceBeginApplyNetworkConfigurationUpdatesResponse =
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10573,7 +10627,7 @@ export type ApiManagementServiceListByResourceGroupNextResponse = ApiManagementS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10593,7 +10647,7 @@ export type ApiManagementServiceListNextResponse = ApiManagementServiceListResul
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10613,7 +10667,7 @@ export type DiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10633,7 +10687,7 @@ export type DiagnosticGetEntityTagResponse = DiagnosticGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10648,7 +10702,7 @@ export type DiagnosticGetResponse = DiagnosticContract & DiagnosticGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10673,7 +10727,7 @@ export type DiagnosticCreateOrUpdateResponse = DiagnosticContract & DiagnosticCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10698,7 +10752,7 @@ export type DiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10718,7 +10772,7 @@ export type EmailTemplateListByServiceResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10738,7 +10792,7 @@ export type EmailTemplateGetEntityTagResponse = EmailTemplateGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10753,7 +10807,7 @@ export type EmailTemplateGetResponse = EmailTemplateContract & EmailTemplateGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10778,7 +10832,7 @@ export type EmailTemplateCreateOrUpdateResponse = EmailTemplateContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10798,7 +10852,7 @@ export type EmailTemplateListByServiceNextResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10818,7 +10872,7 @@ export type GroupListByServiceResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10838,7 +10892,7 @@ export type GroupGetEntityTagResponse = GroupGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10853,7 +10907,7 @@ export type GroupGetResponse = GroupContract & GroupGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10878,7 +10932,7 @@ export type GroupCreateOrUpdateResponse = GroupContract & GroupCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10903,7 +10957,7 @@ export type GroupListByServiceNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10923,7 +10977,7 @@ export type GroupUserListResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10948,7 +11002,7 @@ export type GroupUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10968,7 +11022,7 @@ export type GroupUserCreateResponse = UserContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10988,7 +11042,7 @@ export type GroupUserListNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11008,7 +11062,7 @@ export type IdentityProviderListByServiceResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11028,7 +11082,7 @@ export type IdentityProviderGetEntityTagResponse = IdentityProviderGetEntityTagH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11043,7 +11097,7 @@ export type IdentityProviderGetResponse = IdentityProviderContract & IdentityPro
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11068,7 +11122,7 @@ export type IdentityProviderCreateOrUpdateResponse = IdentityProviderContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11093,7 +11147,7 @@ export type IdentityProviderListByServiceNextResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11113,7 +11167,7 @@ export type IssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11133,7 +11187,7 @@ export type IssueGetResponse = IssueContract & IssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11158,7 +11212,7 @@ export type IssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11178,7 +11232,7 @@ export type LoggerListByServiceResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11198,7 +11252,7 @@ export type LoggerGetEntityTagResponse = LoggerGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11213,7 +11267,7 @@ export type LoggerGetResponse = LoggerContract & LoggerGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11238,7 +11292,7 @@ export type LoggerCreateOrUpdateResponse = LoggerContract & LoggerCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11263,7 +11317,7 @@ export type LoggerListByServiceNextResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11283,7 +11337,7 @@ export type NetworkStatusListByServiceResponse = Array<NetworkStatusContractByLo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11303,7 +11357,7 @@ export type NetworkStatusListByLocationResponse = NetworkStatusContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11323,7 +11377,7 @@ export type NotificationListByServiceResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11343,7 +11397,7 @@ export type NotificationGetResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11363,7 +11417,7 @@ export type NotificationCreateOrUpdateResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11383,7 +11437,7 @@ export type NotificationListByServiceNextResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11403,7 +11457,7 @@ export type NotificationRecipientUserListByNotificationResponse = RecipientUserC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11428,7 +11482,7 @@ export type NotificationRecipientUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11448,7 +11502,7 @@ export type NotificationRecipientUserCreateOrUpdateResponse = RecipientUserContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11468,7 +11522,7 @@ export type NotificationRecipientEmailListByNotificationResponse = RecipientEmai
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11493,7 +11547,7 @@ export type NotificationRecipientEmailCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11513,7 +11567,7 @@ export type NotificationRecipientEmailCreateOrUpdateResponse = RecipientEmailCon
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11533,7 +11587,7 @@ export type OpenIdConnectProviderListByServiceResponse = OpenIdConnectProviderCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11553,7 +11607,7 @@ export type OpenIdConnectProviderGetEntityTagResponse = OpenIdConnectProviderGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11568,7 +11622,7 @@ export type OpenIdConnectProviderGetResponse = OpenidConnectProviderContract & O
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11593,7 +11647,7 @@ export type OpenIdConnectProviderCreateOrUpdateResponse = OpenidConnectProviderC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11618,7 +11672,7 @@ export type OpenIdConnectProviderListByServiceNextResponse = OpenIdConnectProvid
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11638,7 +11692,7 @@ export type PolicyListByServiceResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11658,7 +11712,7 @@ export type PolicyGetEntityTagResponse = PolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11673,7 +11727,7 @@ export type PolicyGetResponse = PolicyContract & PolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11698,7 +11752,7 @@ export type PolicyCreateOrUpdateResponse = PolicyContract & PolicyCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11723,7 +11777,7 @@ export type PolicySnippetListByServiceResponse = PolicySnippetsCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11743,7 +11797,7 @@ export type SignInSettingsGetEntityTagResponse = SignInSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11758,7 +11812,7 @@ export type SignInSettingsGetResponse = PortalSigninSettings & SignInSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11783,7 +11837,7 @@ export type SignInSettingsCreateOrUpdateResponse = PortalSigninSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11803,7 +11857,7 @@ export type SignUpSettingsGetEntityTagResponse = SignUpSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11818,7 +11872,7 @@ export type SignUpSettingsGetResponse = PortalSignupSettings & SignUpSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11843,7 +11897,7 @@ export type SignUpSettingsCreateOrUpdateResponse = PortalSignupSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11863,7 +11917,7 @@ export type DelegationSettingsGetEntityTagResponse = DelegationSettingsGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11878,7 +11932,7 @@ export type DelegationSettingsGetResponse = PortalDelegationSettings & Delegatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11903,7 +11957,7 @@ export type DelegationSettingsCreateOrUpdateResponse = PortalDelegationSettings
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11923,7 +11977,7 @@ export type ProductListByServiceResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11943,7 +11997,7 @@ export type ProductGetEntityTagResponse = ProductGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11958,7 +12012,7 @@ export type ProductGetResponse = ProductContract & ProductGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11983,7 +12037,7 @@ export type ProductCreateOrUpdateResponse = ProductContract & ProductCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12008,7 +12062,7 @@ export type ProductListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12028,7 +12082,7 @@ export type ProductListByServiceNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12048,7 +12102,7 @@ export type ProductListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12068,7 +12122,7 @@ export type ProductApiListByProductResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12088,7 +12142,7 @@ export type ProductApiCreateOrUpdateResponse = ApiContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12108,7 +12162,7 @@ export type ProductApiListByProductNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12128,7 +12182,7 @@ export type ProductGroupListByProductResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12148,7 +12202,7 @@ export type ProductGroupCreateOrUpdateResponse = GroupContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12168,7 +12222,7 @@ export type ProductGroupListByProductNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12188,7 +12242,7 @@ export type ProductSubscriptionsListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12208,7 +12262,7 @@ export type ProductSubscriptionsListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12228,7 +12282,7 @@ export type ProductPolicyListByProductResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12248,7 +12302,7 @@ export type ProductPolicyGetEntityTagResponse = ProductPolicyGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12263,7 +12317,7 @@ export type ProductPolicyGetResponse = PolicyContract & ProductPolicyGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12288,7 +12342,7 @@ export type ProductPolicyCreateOrUpdateResponse = PolicyContract & ProductPolicy
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12313,7 +12367,7 @@ export type PropertyListByServiceResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12333,7 +12387,7 @@ export type PropertyGetEntityTagResponse = PropertyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12348,7 +12402,7 @@ export type PropertyGetResponse = PropertyContract & PropertyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12373,7 +12427,7 @@ export type PropertyCreateOrUpdateResponse = PropertyContract & PropertyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12398,7 +12452,7 @@ export type PropertyListByServiceNextResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12418,7 +12472,7 @@ export type QuotaByCounterKeysListByServiceResponse = QuotaCounterCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12438,7 +12492,7 @@ export type QuotaByPeriodKeysGetResponse = QuotaCounterContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12458,7 +12512,7 @@ export type RegionListByServiceResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12478,7 +12532,7 @@ export type RegionListByServiceNextResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12498,7 +12552,7 @@ export type ReportsListByApiResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12518,7 +12572,7 @@ export type ReportsListByUserResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12538,7 +12592,7 @@ export type ReportsListByOperationResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12558,7 +12612,7 @@ export type ReportsListByProductResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12578,7 +12632,7 @@ export type ReportsListByGeoResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12598,7 +12652,7 @@ export type ReportsListBySubscriptionResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12618,7 +12672,7 @@ export type ReportsListByTimeResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12638,7 +12692,7 @@ export type ReportsListByRequestResponse = RequestReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12658,7 +12712,7 @@ export type ReportsListByApiNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12678,7 +12732,7 @@ export type ReportsListByUserNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12698,7 +12752,7 @@ export type ReportsListByOperationNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12718,7 +12772,7 @@ export type ReportsListByProductNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12738,7 +12792,7 @@ export type ReportsListByGeoNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12758,7 +12812,7 @@ export type ReportsListBySubscriptionNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12778,7 +12832,7 @@ export type ReportsListByTimeNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12798,7 +12852,7 @@ export type SubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12818,7 +12872,7 @@ export type SubscriptionGetEntityTagResponse = SubscriptionGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12833,7 +12887,7 @@ export type SubscriptionGetResponse = SubscriptionContract & SubscriptionGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12858,7 +12912,7 @@ export type SubscriptionCreateOrUpdateResponse = SubscriptionContract & Subscrip
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12883,7 +12937,7 @@ export type SubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12903,7 +12957,7 @@ export type TagResourceListByServiceResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12923,7 +12977,7 @@ export type TagResourceListByServiceNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12943,7 +12997,7 @@ export type TenantAccessGetEntityTagResponse = TenantAccessGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12958,7 +13012,7 @@ export type TenantAccessGetResponse = AccessInformationContract & TenantAccessGe
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12983,7 +13037,7 @@ export type TenantAccessGitGetResponse = AccessInformationContract & TenantAcces
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13008,7 +13062,7 @@ export type TenantConfigurationDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13028,7 +13082,7 @@ export type TenantConfigurationSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13048,7 +13102,7 @@ export type TenantConfigurationValidateResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13068,7 +13122,7 @@ export type TenantConfigurationGetSyncStateResponse = TenantConfigurationSyncSta
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13088,7 +13142,7 @@ export type TenantConfigurationBeginDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13108,7 +13162,7 @@ export type TenantConfigurationBeginSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13128,7 +13182,7 @@ export type TenantConfigurationBeginValidateResponse = OperationResultContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13148,7 +13202,7 @@ export type UserListByServiceResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13168,7 +13222,7 @@ export type UserGetEntityTagResponse = UserGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13183,7 +13237,7 @@ export type UserGetResponse = UserContract & UserGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13208,7 +13262,7 @@ export type UserCreateOrUpdateResponse = UserContract & UserCreateOrUpdateHeader
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13233,7 +13287,7 @@ export type UserGenerateSsoUrlResponse = GenerateSsoUrlResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13253,7 +13307,7 @@ export type UserGetSharedAccessTokenResponse = UserTokenResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13273,7 +13327,7 @@ export type UserListByServiceNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13293,7 +13347,7 @@ export type UserGroupListResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13313,7 +13367,7 @@ export type UserGroupListNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13333,7 +13387,7 @@ export type UserSubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13353,7 +13407,7 @@ export type UserSubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13373,7 +13427,7 @@ export type UserIdentitiesListResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13393,7 +13447,7 @@ export type UserIdentitiesListNextResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13413,7 +13467,7 @@ export type ApiExportGetResponse = ApiExportResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 6b65ce34b85f..60dd6c440a4f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -6,13 +6,13 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { CloudErrorMapper, BaseResourceMapper } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
 
-export const ErrorFieldContract: msRest.CompositeMapper = {
+export const ErrorFieldContract: coreHttp.CompositeMapper = {
   serializedName: "ErrorFieldContract",
   type: {
     name: "Composite",
@@ -40,7 +40,7 @@ export const ErrorFieldContract: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponseBody: msRest.CompositeMapper = {
+export const ErrorResponseBody: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponseBody",
   type: {
     name: "Composite",
@@ -74,7 +74,7 @@ export const ErrorResponseBody: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponse: msRest.CompositeMapper = {
+export const ErrorResponse: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponse",
   type: {
     name: "Composite",
@@ -108,7 +108,7 @@ export const ErrorResponse: msRest.CompositeMapper = {
   }
 };
 
-export const RegionContract: msRest.CompositeMapper = {
+export const RegionContract: coreHttp.CompositeMapper = {
   serializedName: "RegionContract",
   type: {
     name: "Composite",
@@ -137,7 +137,7 @@ export const RegionContract: msRest.CompositeMapper = {
   }
 };
 
-export const Resource: msRest.CompositeMapper = {
+export const Resource: coreHttp.CompositeMapper = {
   serializedName: "Resource",
   type: {
     name: "Composite",
@@ -168,7 +168,7 @@ export const Resource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResultValue: msRest.CompositeMapper = {
+export const ApiExportResultValue: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult_value",
   type: {
     name: "Composite",
@@ -184,7 +184,7 @@ export const ApiExportResultValue: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResult: msRest.CompositeMapper = {
+export const ApiExportResult: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult",
   type: {
     name: "Composite",
@@ -213,7 +213,7 @@ export const ApiExportResult: msRest.CompositeMapper = {
   }
 };
 
-export const ProductEntityBaseParameters: msRest.CompositeMapper = {
+export const ProductEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductEntityBaseParameters",
   type: {
     name: "Composite",
@@ -267,7 +267,7 @@ export const ProductEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
+export const ProductTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ProductTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -295,7 +295,7 @@ export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
+export const OperationTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "OperationTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -360,7 +360,7 @@ export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
+export const SubscriptionKeyParameterNamesContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionKeyParameterNamesContract",
   type: {
     name: "Composite",
@@ -382,7 +382,7 @@ export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OpenIdAuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OpenIdAuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -409,7 +409,7 @@ export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OAuth2AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OAuth2AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -431,7 +431,7 @@ export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -461,7 +461,7 @@ export const AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
+export const ApiVersionSetContractDetails: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContractDetails",
   type: {
     name: "Composite",
@@ -507,7 +507,7 @@ export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
+export const ApiCreateOrUpdatePropertiesWsdlSelector: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateProperties_wsdlSelector",
   type: {
     name: "Composite",
@@ -529,7 +529,7 @@ export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
   }
 };
 
-export const ApiEntityBaseContract: msRest.CompositeMapper = {
+export const ApiEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiEntityBaseContract",
   type: {
     name: "Composite",
@@ -627,7 +627,7 @@ export const ApiEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContractProperties: msRest.CompositeMapper = {
+export const ApiContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiContractProperties",
   type: {
     name: "Composite",
@@ -697,7 +697,7 @@ export const ApiContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
+export const ApiTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -759,7 +759,7 @@ export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagTagResourceContractProperties: msRest.CompositeMapper = {
+export const TagTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "TagTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -785,7 +785,7 @@ export const TagTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceContract: msRest.CompositeMapper = {
+export const TagResourceContract: coreHttp.CompositeMapper = {
   serializedName: "TagResourceContract",
   type: {
     name: "Composite",
@@ -824,7 +824,7 @@ export const TagResourceContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagContract: msRest.CompositeMapper = {
+export const TagContract: coreHttp.CompositeMapper = {
   serializedName: "TagContract",
   type: {
     name: "Composite",
@@ -846,7 +846,7 @@ export const TagContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionContract: msRest.CompositeMapper = {
+export const TagDescriptionContract: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionContract",
   type: {
     name: "Composite",
@@ -888,7 +888,7 @@ export const TagDescriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
+export const TagDescriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCreateParameters",
   type: {
     name: "Composite",
@@ -919,7 +919,7 @@ export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentContract: msRest.CompositeMapper = {
+export const IssueAttachmentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentContract",
   type: {
     name: "Composite",
@@ -951,7 +951,7 @@ export const IssueAttachmentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentContract: msRest.CompositeMapper = {
+export const IssueCommentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentContract",
   type: {
     name: "Composite",
@@ -982,7 +982,7 @@ export const IssueCommentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContractBaseProperties: msRest.CompositeMapper = {
+export const IssueContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "IssueContractBaseProperties",
   type: {
     name: "Composite",
@@ -1010,7 +1010,7 @@ export const IssueContractBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const IssueUpdateContract: msRest.CompositeMapper = {
+export const IssueUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "IssueUpdateContract",
   type: {
     name: "Composite",
@@ -1056,7 +1056,7 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContract: msRest.CompositeMapper = {
+export const IssueContract: coreHttp.CompositeMapper = {
   serializedName: "IssueContract",
   type: {
     name: "Composite",
@@ -1106,7 +1106,7 @@ export const IssueContract: msRest.CompositeMapper = {
   }
 };
 
-export const BodyDiagnosticSettings: msRest.CompositeMapper = {
+export const BodyDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "BodyDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1125,7 +1125,7 @@ export const BodyDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const HttpMessageDiagnostic: msRest.CompositeMapper = {
+export const HttpMessageDiagnostic: coreHttp.CompositeMapper = {
   serializedName: "HttpMessageDiagnostic",
   type: {
     name: "Composite",
@@ -1153,7 +1153,7 @@ export const HttpMessageDiagnostic: msRest.CompositeMapper = {
   }
 };
 
-export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
+export const PipelineDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "PipelineDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1177,7 +1177,7 @@ export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SamplingSettings: msRest.CompositeMapper = {
+export const SamplingSettings: coreHttp.CompositeMapper = {
   serializedName: "SamplingSettings",
   type: {
     name: "Composite",
@@ -1203,7 +1203,7 @@ export const SamplingSettings: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticContract: msRest.CompositeMapper = {
+export const DiagnosticContract: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticContract",
   type: {
     name: "Composite",
@@ -1254,7 +1254,7 @@ export const DiagnosticContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaContract: msRest.CompositeMapper = {
+export const SchemaContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaContract",
   type: {
     name: "Composite",
@@ -1278,7 +1278,7 @@ export const SchemaContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
+export const SchemaCreateOrUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaCreateOrUpdateContract",
   type: {
     name: "Composite",
@@ -1302,7 +1302,7 @@ export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyContract: msRest.CompositeMapper = {
+export const PolicyContract: coreHttp.CompositeMapper = {
   serializedName: "PolicyContract",
   type: {
     name: "Composite",
@@ -1327,7 +1327,7 @@ export const PolicyContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCollection: msRest.CompositeMapper = {
+export const PolicyCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicyCollection",
   type: {
     name: "Composite",
@@ -1355,7 +1355,7 @@ export const PolicyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductContract: msRest.CompositeMapper = {
+export const ProductContract: coreHttp.CompositeMapper = {
   serializedName: "ProductContract",
   type: {
     name: "Composite",
@@ -1421,7 +1421,7 @@ export const ProductContract: msRest.CompositeMapper = {
   }
 };
 
-export const ParameterContract: msRest.CompositeMapper = {
+export const ParameterContract: coreHttp.CompositeMapper = {
   serializedName: "ParameterContract",
   type: {
     name: "Composite",
@@ -1474,7 +1474,7 @@ export const ParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const RepresentationContract: msRest.CompositeMapper = {
+export const RepresentationContract: coreHttp.CompositeMapper = {
   serializedName: "RepresentationContract",
   type: {
     name: "Composite",
@@ -1521,7 +1521,7 @@ export const RepresentationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResponseContract: msRest.CompositeMapper = {
+export const ResponseContract: coreHttp.CompositeMapper = {
   serializedName: "ResponseContract",
   type: {
     name: "Composite",
@@ -1568,7 +1568,7 @@ export const ResponseContract: msRest.CompositeMapper = {
   }
 };
 
-export const RequestContract: msRest.CompositeMapper = {
+export const RequestContract: coreHttp.CompositeMapper = {
   serializedName: "RequestContract",
   type: {
     name: "Composite",
@@ -1620,7 +1620,7 @@ export const RequestContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationEntityBaseContract: msRest.CompositeMapper = {
+export const OperationEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "OperationEntityBaseContract",
   type: {
     name: "Composite",
@@ -1676,7 +1676,7 @@ export const OperationEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationUpdateContract: msRest.CompositeMapper = {
+export const OperationUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OperationUpdateContract",
   type: {
     name: "Composite",
@@ -1758,7 +1758,7 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationContract: msRest.CompositeMapper = {
+export const OperationContract: coreHttp.CompositeMapper = {
   serializedName: "OperationContract",
   type: {
     name: "Composite",
@@ -1844,7 +1844,7 @@ export const OperationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseContract: msRest.CompositeMapper = {
+export const ApiReleaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseContract",
   type: {
     name: "Composite",
@@ -1881,7 +1881,7 @@ export const ApiReleaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionContract: msRest.CompositeMapper = {
+export const ApiRevisionContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionContract",
   type: {
     name: "Composite",
@@ -1954,7 +1954,7 @@ export const ApiRevisionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiUpdateContract: msRest.CompositeMapper = {
+export const ApiUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "ApiUpdateContract",
   type: {
     name: "Composite",
@@ -2097,7 +2097,7 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContract: msRest.CompositeMapper = {
+export const ApiContract: coreHttp.CompositeMapper = {
   serializedName: "ApiContract",
   type: {
     name: "Composite",
@@ -2255,7 +2255,7 @@ export const ApiContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateParameter: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateParameter",
   type: {
     name: "Composite",
@@ -2437,7 +2437,7 @@ export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
+export const ApiVersionSetEntityBase: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetEntityBase",
   type: {
     name: "Composite",
@@ -2473,7 +2473,7 @@ export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
+export const ApiVersionSetUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetUpdateParameters",
   type: {
     name: "Composite",
@@ -2525,7 +2525,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContract: msRest.CompositeMapper = {
+export const ApiVersionSetContract: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContract",
   type: {
     name: "Composite",
@@ -2580,7 +2580,7 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
   }
 };
 
-export const TokenBodyParameterContract: msRest.CompositeMapper = {
+export const TokenBodyParameterContract: coreHttp.CompositeMapper = {
   serializedName: "TokenBodyParameterContract",
   type: {
     name: "Composite",
@@ -2604,7 +2604,7 @@ export const TokenBodyParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper = {
+export const AuthorizationServerContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContractBaseProperties",
   type: {
     name: "Composite",
@@ -2711,7 +2711,7 @@ export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper =
   }
 };
 
-export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
+export const AuthorizationServerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerUpdateContract",
   type: {
     name: "Composite",
@@ -2858,7 +2858,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContract: msRest.CompositeMapper = {
+export const AuthorizationServerContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContract",
   type: {
     name: "Composite",
@@ -3010,7 +3010,7 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendReconnectContract: msRest.CompositeMapper = {
+export const BackendReconnectContract: coreHttp.CompositeMapper = {
   serializedName: "BackendReconnectContract",
   type: {
     name: "Composite",
@@ -3027,7 +3027,7 @@ export const BackendReconnectContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendTlsProperties: msRest.CompositeMapper = {
+export const BackendTlsProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendTlsProperties",
   type: {
     name: "Composite",
@@ -3051,7 +3051,7 @@ export const BackendTlsProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProxyContract: msRest.CompositeMapper = {
+export const BackendProxyContract: coreHttp.CompositeMapper = {
   serializedName: "BackendProxyContract",
   type: {
     name: "Composite",
@@ -3084,7 +3084,7 @@ export const BackendProxyContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
+export const BackendAuthorizationHeaderCredentials: coreHttp.CompositeMapper = {
   serializedName: "BackendAuthorizationHeaderCredentials",
   type: {
     name: "Composite",
@@ -3116,7 +3116,7 @@ export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCredentialsContract: msRest.CompositeMapper = {
+export const BackendCredentialsContract: coreHttp.CompositeMapper = {
   serializedName: "BackendCredentialsContract",
   type: {
     name: "Composite",
@@ -3179,7 +3179,7 @@ export const BackendCredentialsContract: msRest.CompositeMapper = {
   }
 };
 
-export const X509CertificateName: msRest.CompositeMapper = {
+export const X509CertificateName: coreHttp.CompositeMapper = {
   serializedName: "X509CertificateName",
   type: {
     name: "Composite",
@@ -3201,7 +3201,7 @@ export const X509CertificateName: msRest.CompositeMapper = {
   }
 };
 
-export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
+export const BackendServiceFabricClusterProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendServiceFabricClusterProperties",
   type: {
     name: "Composite",
@@ -3259,7 +3259,7 @@ export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProperties: msRest.CompositeMapper = {
+export const BackendProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendProperties",
   type: {
     name: "Composite",
@@ -3276,7 +3276,7 @@ export const BackendProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendBaseParameters: msRest.CompositeMapper = {
+export const BackendBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendBaseParameters",
   type: {
     name: "Composite",
@@ -3344,7 +3344,7 @@ export const BackendBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendUpdateParameters: msRest.CompositeMapper = {
+export const BackendUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendUpdateParameters",
   type: {
     name: "Composite",
@@ -3428,7 +3428,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendContract: msRest.CompositeMapper = {
+export const BackendContract: coreHttp.CompositeMapper = {
   serializedName: "BackendContract",
   type: {
     name: "Composite",
@@ -3515,7 +3515,7 @@ export const BackendContract: msRest.CompositeMapper = {
   }
 };
 
-export const CacheUpdateParameters: msRest.CompositeMapper = {
+export const CacheUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CacheUpdateParameters",
   type: {
     name: "Composite",
@@ -3552,7 +3552,7 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const CacheContract: msRest.CompositeMapper = {
+export const CacheContract: coreHttp.CompositeMapper = {
   serializedName: "CacheContract",
   type: {
     name: "Composite",
@@ -3591,7 +3591,7 @@ export const CacheContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateContract: msRest.CompositeMapper = {
+export const CertificateContract: coreHttp.CompositeMapper = {
   serializedName: "CertificateContract",
   type: {
     name: "Composite",
@@ -3623,7 +3623,7 @@ export const CertificateContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CertificateCreateOrUpdateParameters",
   type: {
     name: "Composite",
@@ -3647,7 +3647,7 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSku: msRest.CompositeMapper = {
+export const ResourceSku: coreHttp.CompositeMapper = {
   serializedName: "ResourceSku",
   type: {
     name: "Composite",
@@ -3663,7 +3663,7 @@ export const ResourceSku: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuCapacity: msRest.CompositeMapper = {
+export const ResourceSkuCapacity: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuCapacity",
   type: {
     name: "Composite",
@@ -3701,7 +3701,7 @@ export const ResourceSkuCapacity: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResult: msRest.CompositeMapper = {
+export const ResourceSkuResult: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResult",
   type: {
     name: "Composite",
@@ -3734,7 +3734,7 @@ export const ResourceSkuResult: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateInformation: msRest.CompositeMapper = {
+export const CertificateInformation: coreHttp.CompositeMapper = {
   serializedName: "CertificateInformation",
   type: {
     name: "Composite",
@@ -3765,7 +3765,7 @@ export const CertificateInformation: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateConfiguration: msRest.CompositeMapper = {
+export const CertificateConfiguration: coreHttp.CompositeMapper = {
   serializedName: "CertificateConfiguration",
   type: {
     name: "Composite",
@@ -3801,7 +3801,7 @@ export const CertificateConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const HostnameConfiguration: msRest.CompositeMapper = {
+export const HostnameConfiguration: coreHttp.CompositeMapper = {
   serializedName: "HostnameConfiguration",
   type: {
     name: "Composite",
@@ -3864,7 +3864,7 @@ export const HostnameConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
+export const VirtualNetworkConfiguration: coreHttp.CompositeMapper = {
   serializedName: "VirtualNetworkConfiguration",
   type: {
     name: "Composite",
@@ -3897,7 +3897,7 @@ export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceSkuProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceSkuProperties",
   type: {
     name: "Composite",
@@ -3920,7 +3920,7 @@ export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
   }
 };
 
-export const AdditionalLocation: msRest.CompositeMapper = {
+export const AdditionalLocation: coreHttp.CompositeMapper = {
   serializedName: "AdditionalLocation",
   type: {
     name: "Composite",
@@ -3983,7 +3983,7 @@ export const AdditionalLocation: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceBackupRestoreParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBackupRestoreParameters",
   type: {
     name: "Composite",
@@ -4021,7 +4021,7 @@ export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBaseProperties",
   type: {
     name: "Composite",
@@ -4188,7 +4188,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
+export const ApiManagementServiceIdentity: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceIdentity",
   type: {
     name: "Composite",
@@ -4221,7 +4221,7 @@ export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
   }
 };
 
-export const ApimResource: msRest.CompositeMapper = {
+export const ApimResource: coreHttp.CompositeMapper = {
   serializedName: "ApimResource",
   type: {
     name: "Composite",
@@ -4263,7 +4263,7 @@ export const ApimResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceResource: msRest.CompositeMapper = {
+export const ApiManagementServiceResource: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceResource",
   type: {
     name: "Composite",
@@ -4480,7 +4480,7 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceUpdateParameters",
   type: {
     name: "Composite",
@@ -4687,7 +4687,7 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
+export const ApiManagementServiceGetSsoTokenResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceGetSsoTokenResult",
   type: {
     name: "Composite",
@@ -4703,7 +4703,7 @@ export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceCheckNameAvailabilityParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
   type: {
     name: "Composite",
@@ -4720,7 +4720,7 @@ export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.Composi
   }
 };
 
-export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
+export const ApiManagementServiceNameAvailabilityResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceNameAvailabilityResult",
   type: {
     name: "Composite",
@@ -4755,7 +4755,7 @@ export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceApplyNetworkConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
   type: {
     name: "Composite",
@@ -4771,7 +4771,7 @@ export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.Com
   }
 };
 
-export const OperationDisplay: msRest.CompositeMapper = {
+export const OperationDisplay: coreHttp.CompositeMapper = {
   serializedName: "Operation_display",
   type: {
     name: "Composite",
@@ -4805,7 +4805,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
   }
 };
 
-export const Operation: msRest.CompositeMapper = {
+export const Operation: coreHttp.CompositeMapper = {
   serializedName: "Operation",
   type: {
     name: "Composite",
@@ -4840,7 +4840,7 @@ export const Operation: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
+export const EmailTemplateParametersContractProperties: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateParametersContractProperties",
   type: {
     name: "Composite",
@@ -4882,7 +4882,7 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+export const EmailTemplateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateUpdateParameters",
   type: {
     name: "Composite",
@@ -4935,7 +4935,7 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
+export const EmailTemplateContract: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateContract",
   type: {
     name: "Composite",
@@ -4998,7 +4998,7 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityContract: msRest.CompositeMapper = {
+export const UserIdentityContract: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityContract",
   type: {
     name: "Composite",
@@ -5020,7 +5020,7 @@ export const UserIdentityContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserEntityBaseParameters: msRest.CompositeMapper = {
+export const UserEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "UserEntityBaseParameters",
   type: {
     name: "Composite",
@@ -5055,7 +5055,7 @@ export const UserEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContractProperties: msRest.CompositeMapper = {
+export const GroupContractProperties: coreHttp.CompositeMapper = {
   serializedName: "GroupContractProperties",
   type: {
     name: "Composite",
@@ -5109,7 +5109,7 @@ export const GroupContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const UserContract: msRest.CompositeMapper = {
+export const UserContract: coreHttp.CompositeMapper = {
   serializedName: "UserContract",
   type: {
     name: "Composite",
@@ -5182,7 +5182,7 @@ export const UserContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupUpdateParameters: msRest.CompositeMapper = {
+export const GroupUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
@@ -5225,7 +5225,7 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContract: msRest.CompositeMapper = {
+export const GroupContract: coreHttp.CompositeMapper = {
   serializedName: "GroupContract",
   type: {
     name: "Composite",
@@ -5280,7 +5280,7 @@ export const GroupContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateParameters: msRest.CompositeMapper = {
+export const GroupCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupCreateParameters",
   type: {
     name: "Composite",
@@ -5324,7 +5324,7 @@ export const GroupCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
+export const IdentityProviderBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderBaseParameters",
   type: {
     name: "Composite",
@@ -5396,7 +5396,7 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+export const IdentityProviderUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
@@ -5486,7 +5486,7 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
+export const IdentityProviderContract: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
@@ -5579,7 +5579,7 @@ export const IdentityProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerUpdateContract: msRest.CompositeMapper = {
+export const LoggerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerUpdateContract",
   type: {
     name: "Composite",
@@ -5618,7 +5618,7 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerContract: msRest.CompositeMapper = {
+export const LoggerContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerContract",
   type: {
     name: "Composite",
@@ -5669,7 +5669,7 @@ export const LoggerContract: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityStatusContract: msRest.CompositeMapper = {
+export const ConnectivityStatusContract: coreHttp.CompositeMapper = {
   serializedName: "ConnectivityStatusContract",
   type: {
     name: "Composite",
@@ -5716,7 +5716,7 @@ export const ConnectivityStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContract: msRest.CompositeMapper = {
+export const NetworkStatusContract: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContract",
   type: {
     name: "Composite",
@@ -5751,7 +5751,7 @@ export const NetworkStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
+export const NetworkStatusContractByLocation: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContractByLocation",
   type: {
     name: "Composite",
@@ -5777,7 +5777,7 @@ export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailContract: msRest.CompositeMapper = {
+export const RecipientEmailContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailContract",
   type: {
     name: "Composite",
@@ -5794,7 +5794,7 @@ export const RecipientEmailContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailCollection: msRest.CompositeMapper = {
+export const RecipientEmailCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailCollection",
   type: {
     name: "Composite",
@@ -5822,7 +5822,7 @@ export const RecipientEmailCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserContract: msRest.CompositeMapper = {
+export const RecipientUserContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserContract",
   type: {
     name: "Composite",
@@ -5839,7 +5839,7 @@ export const RecipientUserContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserCollection: msRest.CompositeMapper = {
+export const RecipientUserCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserCollection",
   type: {
     name: "Composite",
@@ -5867,7 +5867,7 @@ export const RecipientUserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientsContractProperties: msRest.CompositeMapper = {
+export const RecipientsContractProperties: coreHttp.CompositeMapper = {
   serializedName: "RecipientsContractProperties",
   type: {
     name: "Composite",
@@ -5899,7 +5899,7 @@ export const RecipientsContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationContract: msRest.CompositeMapper = {
+export const NotificationContract: coreHttp.CompositeMapper = {
   serializedName: "NotificationContract",
   type: {
     name: "Composite",
@@ -5934,7 +5934,7 @@ export const NotificationContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderUpdateContract",
   type: {
     name: "Composite",
@@ -5977,7 +5977,7 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderContract",
   type: {
     name: "Composite",
@@ -6024,7 +6024,7 @@ export const OpenidConnectProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetContract: msRest.CompositeMapper = {
+export const PolicySnippetContract: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetContract",
   type: {
     name: "Composite",
@@ -6062,7 +6062,7 @@ export const PolicySnippetContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetsCollection: msRest.CompositeMapper = {
+export const PolicySnippetsCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetsCollection",
   type: {
     name: "Composite",
@@ -6084,7 +6084,7 @@ export const PolicySnippetsCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper = {
+export const RegistrationDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "RegistrationDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6100,7 +6100,7 @@ export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper = {
+export const SubscriptionsDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionsDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6116,7 +6116,7 @@ export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const PortalDelegationSettings: msRest.CompositeMapper = {
+export const PortalDelegationSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalDelegationSettings",
   type: {
     name: "Composite",
@@ -6153,7 +6153,7 @@ export const PortalDelegationSettings: msRest.CompositeMapper = {
   }
 };
 
-export const TermsOfServiceProperties: msRest.CompositeMapper = {
+export const TermsOfServiceProperties: coreHttp.CompositeMapper = {
   serializedName: "TermsOfServiceProperties",
   type: {
     name: "Composite",
@@ -6181,7 +6181,7 @@ export const TermsOfServiceProperties: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSignupSettings: msRest.CompositeMapper = {
+export const PortalSignupSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSignupSettings",
   type: {
     name: "Composite",
@@ -6205,7 +6205,7 @@ export const PortalSignupSettings: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSigninSettings: msRest.CompositeMapper = {
+export const PortalSigninSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSigninSettings",
   type: {
     name: "Composite",
@@ -6222,7 +6222,7 @@ export const PortalSigninSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionContract: msRest.CompositeMapper = {
+export const SubscriptionContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionContract",
   type: {
     name: "Composite",
@@ -6336,7 +6336,7 @@ export const SubscriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ProductUpdateParameters: msRest.CompositeMapper = {
+export const ProductUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductUpdateParameters",
   type: {
     name: "Composite",
@@ -6400,7 +6400,7 @@ export const ProductUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
+export const PropertyEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyEntityBaseParameters",
   type: {
     name: "Composite",
@@ -6430,7 +6430,7 @@ export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyUpdateParameters: msRest.CompositeMapper = {
+export const PropertyUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyUpdateParameters",
   type: {
     name: "Composite",
@@ -6481,7 +6481,7 @@ export const PropertyUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyContract: msRest.CompositeMapper = {
+export const PropertyContract: coreHttp.CompositeMapper = {
   serializedName: "PropertyContract",
   type: {
     name: "Composite",
@@ -6535,7 +6535,7 @@ export const PropertyContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
+export const QuotaCounterValueContractProperties: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContractProperties",
   type: {
     name: "Composite",
@@ -6557,7 +6557,7 @@ export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterContract: msRest.CompositeMapper = {
+export const QuotaCounterContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterContract",
   type: {
     name: "Composite",
@@ -6608,7 +6608,7 @@ export const QuotaCounterContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterCollection: msRest.CompositeMapper = {
+export const QuotaCounterCollection: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterCollection",
   type: {
     name: "Composite",
@@ -6642,7 +6642,7 @@ export const QuotaCounterCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportRecordContract: msRest.CompositeMapper = {
+export const RequestReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "RequestReportRecordContract",
   type: {
     name: "Composite",
@@ -6762,7 +6762,7 @@ export const RequestReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const ReportRecordContract: msRest.CompositeMapper = {
+export const ReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "ReportRecordContract",
   type: {
     name: "Composite",
@@ -6930,7 +6930,7 @@ export const ReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
+export const SubscriptionUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionUpdateParameters",
   type: {
     name: "Composite",
@@ -7010,7 +7010,7 @@ export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateParameters: msRest.CompositeMapper = {
+export const SubscriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCreateParameters",
   type: {
     name: "Composite",
@@ -7084,7 +7084,7 @@ export const SubscriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateUpdateParameters: msRest.CompositeMapper = {
+export const TagCreateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagCreateUpdateParameters",
   type: {
     name: "Composite",
@@ -7105,7 +7105,7 @@ export const TagCreateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
+export const TenantConfigurationSyncStateContract: coreHttp.CompositeMapper = {
   serializedName: "TenantConfigurationSyncStateContract",
   type: {
     name: "Composite",
@@ -7157,7 +7157,7 @@ export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultLogItemContract: msRest.CompositeMapper = {
+export const OperationResultLogItemContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultLogItemContract",
   type: {
     name: "Composite",
@@ -7185,7 +7185,7 @@ export const OperationResultLogItemContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultContract: msRest.CompositeMapper = {
+export const OperationResultContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultContract",
   type: {
     name: "Composite",
@@ -7251,7 +7251,7 @@ export const OperationResultContract: msRest.CompositeMapper = {
   }
 };
 
-export const DeployConfigurationParameters: msRest.CompositeMapper = {
+export const DeployConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "DeployConfigurationParameters",
   type: {
     name: "Composite",
@@ -7274,7 +7274,7 @@ export const DeployConfigurationParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SaveConfigurationParameter: msRest.CompositeMapper = {
+export const SaveConfigurationParameter: coreHttp.CompositeMapper = {
   serializedName: "SaveConfigurationParameter",
   type: {
     name: "Composite",
@@ -7297,7 +7297,7 @@ export const SaveConfigurationParameter: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationContract: msRest.CompositeMapper = {
+export const AccessInformationContract: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationContract",
   type: {
     name: "Composite",
@@ -7331,7 +7331,7 @@ export const AccessInformationContract: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
+export const AccessInformationUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationUpdateParameters",
   type: {
     name: "Composite",
@@ -7347,7 +7347,7 @@ export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenResult: msRest.CompositeMapper = {
+export const UserTokenResult: coreHttp.CompositeMapper = {
   serializedName: "UserTokenResult",
   type: {
     name: "Composite",
@@ -7363,7 +7363,7 @@ export const UserTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenParameters: msRest.CompositeMapper = {
+export const UserTokenParameters: coreHttp.CompositeMapper = {
   serializedName: "UserTokenParameters",
   type: {
     name: "Composite",
@@ -7392,7 +7392,7 @@ export const UserTokenParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GenerateSsoUrlResult: msRest.CompositeMapper = {
+export const GenerateSsoUrlResult: coreHttp.CompositeMapper = {
   serializedName: "GenerateSsoUrlResult",
   type: {
     name: "Composite",
@@ -7408,7 +7408,7 @@ export const GenerateSsoUrlResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserUpdateParameters: msRest.CompositeMapper = {
+export const UserUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserUpdateParameters",
   type: {
     name: "Composite",
@@ -7479,7 +7479,7 @@ export const UserUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateParameters: msRest.CompositeMapper = {
+export const UserCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserCreateParameters",
   type: {
     name: "Composite",
@@ -7559,7 +7559,7 @@ export const UserCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionInfoContract: msRest.CompositeMapper = {
+export const ApiRevisionInfoContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionInfoContract",
   type: {
     name: "Composite",
@@ -7600,7 +7600,7 @@ export const ApiRevisionInfoContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContract: msRest.CompositeMapper = {
+export const QuotaCounterValueContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContract",
   type: {
     name: "Composite",
@@ -7622,7 +7622,7 @@ export const QuotaCounterValueContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7638,7 +7638,7 @@ export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetHeaders: msRest.CompositeMapper = {
+export const ApiGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-get-headers",
   type: {
     name: "Composite",
@@ -7654,7 +7654,7 @@ export const ApiGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7670,7 +7670,7 @@ export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7686,7 +7686,7 @@ export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-get-headers",
   type: {
     name: "Composite",
@@ -7702,7 +7702,7 @@ export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiReleaseCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7718,7 +7718,7 @@ export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7734,7 +7734,7 @@ export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-get-headers",
   type: {
     name: "Composite",
@@ -7750,7 +7750,7 @@ export const ApiOperationGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7766,7 +7766,7 @@ export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7782,7 +7782,7 @@ export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-get-headers",
   type: {
     name: "Composite",
@@ -7798,7 +7798,7 @@ export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7814,7 +7814,7 @@ export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyoperation-headers",
   type: {
     name: "Composite",
@@ -7830,7 +7830,7 @@ export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyoperation-headers",
   type: {
     name: "Composite",
@@ -7846,7 +7846,7 @@ export const TagGetByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7862,7 +7862,7 @@ export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-get-headers",
   type: {
     name: "Composite",
@@ -7878,7 +7878,7 @@ export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7894,7 +7894,7 @@ export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7910,7 +7910,7 @@ export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-get-headers",
   type: {
     name: "Composite",
@@ -7926,7 +7926,7 @@ export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiSchemaCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7942,7 +7942,7 @@ export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7958,7 +7958,7 @@ export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-get-headers",
   type: {
     name: "Composite",
@@ -7974,7 +7974,7 @@ export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7990,7 +7990,7 @@ export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8006,7 +8006,7 @@ export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-get-headers",
   type: {
     name: "Composite",
@@ -8022,7 +8022,7 @@ export const ApiIssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8038,7 +8038,7 @@ export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8054,7 +8054,7 @@ export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-get-headers",
   type: {
     name: "Composite",
@@ -8070,7 +8070,7 @@ export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8086,7 +8086,7 @@ export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8102,7 +8102,7 @@ export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-get-headers",
   type: {
     name: "Composite",
@@ -8118,7 +8118,7 @@ export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8134,7 +8134,7 @@ export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8150,7 +8150,7 @@ export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-get-headers",
   type: {
     name: "Composite",
@@ -8166,7 +8166,7 @@ export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8182,7 +8182,7 @@ export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyapi-headers",
   type: {
     name: "Composite",
@@ -8198,7 +8198,7 @@ export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByApiHeaders: msRest.CompositeMapper = {
+export const TagGetByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyapi-headers",
   type: {
     name: "Composite",
@@ -8214,7 +8214,7 @@ export const TagGetByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagAssignToApiHeaders: msRest.CompositeMapper = {
+export const TagAssignToApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-assigntoapi-headers",
   type: {
     name: "Composite",
@@ -8230,7 +8230,7 @@ export const TagAssignToApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8246,7 +8246,7 @@ export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-get-headers",
   type: {
     name: "Composite",
@@ -8262,7 +8262,7 @@ export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8278,7 +8278,7 @@ export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8294,7 +8294,7 @@ export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-get-headers",
   type: {
     name: "Composite",
@@ -8310,7 +8310,7 @@ export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8326,7 +8326,7 @@ export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper =
   }
 };
 
-export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
+export const BackendGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8342,7 +8342,7 @@ export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendGetHeaders: msRest.CompositeMapper = {
+export const BackendGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-get-headers",
   type: {
     name: "Composite",
@@ -8358,7 +8358,7 @@ export const BackendGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const BackendCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8374,7 +8374,7 @@ export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CacheGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8390,7 +8390,7 @@ export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetHeaders: msRest.CompositeMapper = {
+export const CacheGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-get-headers",
   type: {
     name: "Composite",
@@ -8406,7 +8406,7 @@ export const CacheGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CacheCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8422,7 +8422,7 @@ export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CertificateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8438,7 +8438,7 @@ export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetHeaders: msRest.CompositeMapper = {
+export const CertificateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-get-headers",
   type: {
     name: "Composite",
@@ -8454,7 +8454,7 @@ export const CertificateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8470,7 +8470,7 @@ export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8486,7 +8486,7 @@ export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-get-headers",
   type: {
     name: "Composite",
@@ -8502,7 +8502,7 @@ export const DiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const DiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8518,7 +8518,7 @@ export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8534,7 +8534,7 @@ export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-get-headers",
   type: {
     name: "Composite",
@@ -8550,7 +8550,7 @@ export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
+export const GroupGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8566,7 +8566,7 @@ export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetHeaders: msRest.CompositeMapper = {
+export const GroupGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-get-headers",
   type: {
     name: "Composite",
@@ -8582,7 +8582,7 @@ export const GroupGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const GroupCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8598,7 +8598,7 @@ export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8614,7 +8614,7 @@ export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-get-headers",
   type: {
     name: "Composite",
@@ -8630,7 +8630,7 @@ export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const IdentityProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8646,7 +8646,7 @@ export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IssueGetHeaders: msRest.CompositeMapper = {
+export const IssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "issue-get-headers",
   type: {
     name: "Composite",
@@ -8662,7 +8662,7 @@ export const IssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const LoggerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8678,7 +8678,7 @@ export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetHeaders: msRest.CompositeMapper = {
+export const LoggerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-get-headers",
   type: {
     name: "Composite",
@@ -8694,7 +8694,7 @@ export const LoggerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const LoggerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8710,7 +8710,7 @@ export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8726,7 +8726,7 @@ export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper =
   }
 };
 
-export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-get-headers",
   type: {
     name: "Composite",
@@ -8742,7 +8742,7 @@ export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8758,7 +8758,7 @@ export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper
   }
 };
 
-export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8774,7 +8774,7 @@ export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyGetHeaders: msRest.CompositeMapper = {
+export const PolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-get-headers",
   type: {
     name: "Composite",
@@ -8790,7 +8790,7 @@ export const PolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8806,7 +8806,7 @@ export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8822,7 +8822,7 @@ export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-get-headers",
   type: {
     name: "Composite",
@@ -8838,7 +8838,7 @@ export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8854,7 +8854,7 @@ export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-get-headers",
   type: {
     name: "Composite",
@@ -8870,7 +8870,7 @@ export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8886,7 +8886,7 @@ export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-get-headers",
   type: {
     name: "Composite",
@@ -8902,7 +8902,7 @@ export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8918,7 +8918,7 @@ export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetHeaders: msRest.CompositeMapper = {
+export const ProductGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-get-headers",
   type: {
     name: "Composite",
@@ -8934,7 +8934,7 @@ export const ProductGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8950,7 +8950,7 @@ export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8966,7 +8966,7 @@ export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-get-headers",
   type: {
     name: "Composite",
@@ -8982,7 +8982,7 @@ export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8998,7 +8998,7 @@ export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyproduct-headers",
   type: {
     name: "Composite",
@@ -9014,7 +9014,7 @@ export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByProductHeaders: msRest.CompositeMapper = {
+export const TagGetByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyproduct-headers",
   type: {
     name: "Composite",
@@ -9030,7 +9030,7 @@ export const TagGetByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PropertyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9046,7 +9046,7 @@ export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetHeaders: msRest.CompositeMapper = {
+export const PropertyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-get-headers",
   type: {
     name: "Composite",
@@ -9062,7 +9062,7 @@ export const PropertyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PropertyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9078,7 +9078,7 @@ export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9094,7 +9094,7 @@ export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-get-headers",
   type: {
     name: "Composite",
@@ -9110,7 +9110,7 @@ export const SubscriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const SubscriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9126,7 +9126,7 @@ export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystate-headers",
   type: {
     name: "Composite",
@@ -9142,7 +9142,7 @@ export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetHeaders: msRest.CompositeMapper = {
+export const TagGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-get-headers",
   type: {
     name: "Composite",
@@ -9158,7 +9158,7 @@ export const TagGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const TagCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9174,7 +9174,7 @@ export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9190,7 +9190,7 @@ export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-get-headers",
   type: {
     name: "Composite",
@@ -9206,7 +9206,7 @@ export const TenantAccessGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGitGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccessgit-get-headers",
   type: {
     name: "Composite",
@@ -9222,7 +9222,7 @@ export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
+export const UserGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9238,7 +9238,7 @@ export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetHeaders: msRest.CompositeMapper = {
+export const UserGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-get-headers",
   type: {
     name: "Composite",
@@ -9254,7 +9254,7 @@ export const UserGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const UserCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9270,7 +9270,7 @@ export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCollection: msRest.CompositeMapper = {
+export const ApiCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiCollection",
   type: {
     name: "Composite",
@@ -9300,7 +9300,7 @@ export const ApiCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceCollection: msRest.CompositeMapper = {
+export const TagResourceCollection: coreHttp.CompositeMapper = {
   serializedName: "TagResourceCollection",
   type: {
     name: "Composite",
@@ -9328,7 +9328,7 @@ export const TagResourceCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionCollection: msRest.CompositeMapper = {
+export const ApiRevisionCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionCollection",
   type: {
     name: "Composite",
@@ -9358,7 +9358,7 @@ export const ApiRevisionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCollection: msRest.CompositeMapper = {
+export const ApiReleaseCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseCollection",
   type: {
     name: "Composite",
@@ -9388,7 +9388,7 @@ export const ApiReleaseCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationCollection: msRest.CompositeMapper = {
+export const OperationCollection: coreHttp.CompositeMapper = {
   serializedName: "OperationCollection",
   type: {
     name: "Composite",
@@ -9418,7 +9418,7 @@ export const OperationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagCollection: msRest.CompositeMapper = {
+export const TagCollection: coreHttp.CompositeMapper = {
   serializedName: "TagCollection",
   type: {
     name: "Composite",
@@ -9446,7 +9446,7 @@ export const TagCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCollection: msRest.CompositeMapper = {
+export const ProductCollection: coreHttp.CompositeMapper = {
   serializedName: "ProductCollection",
   type: {
     name: "Composite",
@@ -9474,7 +9474,7 @@ export const ProductCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCollection: msRest.CompositeMapper = {
+export const SchemaCollection: coreHttp.CompositeMapper = {
   serializedName: "SchemaCollection",
   type: {
     name: "Composite",
@@ -9504,7 +9504,7 @@ export const SchemaCollection: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCollection: msRest.CompositeMapper = {
+export const DiagnosticCollection: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticCollection",
   type: {
     name: "Composite",
@@ -9532,7 +9532,7 @@ export const DiagnosticCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCollection: msRest.CompositeMapper = {
+export const IssueCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCollection",
   type: {
     name: "Composite",
@@ -9562,7 +9562,7 @@ export const IssueCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentCollection: msRest.CompositeMapper = {
+export const IssueCommentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentCollection",
   type: {
     name: "Composite",
@@ -9592,7 +9592,7 @@ export const IssueCommentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentCollection: msRest.CompositeMapper = {
+export const IssueAttachmentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentCollection",
   type: {
     name: "Composite",
@@ -9622,7 +9622,7 @@ export const IssueAttachmentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCollection: msRest.CompositeMapper = {
+export const TagDescriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCollection",
   type: {
     name: "Composite",
@@ -9650,7 +9650,7 @@ export const TagDescriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCollection: msRest.CompositeMapper = {
+export const ApiVersionSetCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetCollection",
   type: {
     name: "Composite",
@@ -9678,7 +9678,7 @@ export const ApiVersionSetCollection: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCollection: msRest.CompositeMapper = {
+export const AuthorizationServerCollection: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerCollection",
   type: {
     name: "Composite",
@@ -9712,7 +9712,7 @@ export const AuthorizationServerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCollection: msRest.CompositeMapper = {
+export const BackendCollection: coreHttp.CompositeMapper = {
   serializedName: "BackendCollection",
   type: {
     name: "Composite",
@@ -9740,7 +9740,7 @@ export const BackendCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCollection: msRest.CompositeMapper = {
+export const CacheCollection: coreHttp.CompositeMapper = {
   serializedName: "CacheCollection",
   type: {
     name: "Composite",
@@ -9768,7 +9768,7 @@ export const CacheCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCollection: msRest.CompositeMapper = {
+export const CertificateCollection: coreHttp.CompositeMapper = {
   serializedName: "CertificateCollection",
   type: {
     name: "Composite",
@@ -9796,7 +9796,7 @@ export const CertificateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationListResult: msRest.CompositeMapper = {
+export const OperationListResult: coreHttp.CompositeMapper = {
   serializedName: "OperationListResult",
   type: {
     name: "Composite",
@@ -9824,7 +9824,7 @@ export const OperationListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResults: msRest.CompositeMapper = {
+export const ResourceSkuResults: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResults",
   type: {
     name: "Composite",
@@ -9853,7 +9853,7 @@ export const ResourceSkuResults: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceListResult: msRest.CompositeMapper = {
+export const ApiManagementServiceListResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceListResult",
   type: {
     name: "Composite",
@@ -9882,7 +9882,7 @@ export const ApiManagementServiceListResult: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateCollection: msRest.CompositeMapper = {
+export const EmailTemplateCollection: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateCollection",
   type: {
     name: "Composite",
@@ -9910,7 +9910,7 @@ export const EmailTemplateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCollection: msRest.CompositeMapper = {
+export const GroupCollection: coreHttp.CompositeMapper = {
   serializedName: "GroupCollection",
   type: {
     name: "Composite",
@@ -9938,7 +9938,7 @@ export const GroupCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserCollection: msRest.CompositeMapper = {
+export const UserCollection: coreHttp.CompositeMapper = {
   serializedName: "UserCollection",
   type: {
     name: "Composite",
@@ -9966,7 +9966,7 @@ export const UserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderList: msRest.CompositeMapper = {
+export const IdentityProviderList: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderList",
   type: {
     name: "Composite",
@@ -9994,7 +9994,7 @@ export const IdentityProviderList: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCollection: msRest.CompositeMapper = {
+export const LoggerCollection: coreHttp.CompositeMapper = {
   serializedName: "LoggerCollection",
   type: {
     name: "Composite",
@@ -10028,7 +10028,7 @@ export const LoggerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationCollection: msRest.CompositeMapper = {
+export const NotificationCollection: coreHttp.CompositeMapper = {
   serializedName: "NotificationCollection",
   type: {
     name: "Composite",
@@ -10056,7 +10056,7 @@ export const NotificationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCollection: coreHttp.CompositeMapper = {
   serializedName: "OpenIdConnectProviderCollection",
   type: {
     name: "Composite",
@@ -10084,7 +10084,7 @@ export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCollection: msRest.CompositeMapper = {
+export const SubscriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCollection",
   type: {
     name: "Composite",
@@ -10112,7 +10112,7 @@ export const SubscriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCollection: msRest.CompositeMapper = {
+export const PropertyCollection: coreHttp.CompositeMapper = {
   serializedName: "PropertyCollection",
   type: {
     name: "Composite",
@@ -10140,7 +10140,7 @@ export const PropertyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegionListResult: msRest.CompositeMapper = {
+export const RegionListResult: coreHttp.CompositeMapper = {
   serializedName: "RegionListResult",
   type: {
     name: "Composite",
@@ -10174,7 +10174,7 @@ export const RegionListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ReportCollection: msRest.CompositeMapper = {
+export const ReportCollection: coreHttp.CompositeMapper = {
   serializedName: "ReportCollection",
   type: {
     name: "Composite",
@@ -10208,7 +10208,7 @@ export const ReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportCollection: msRest.CompositeMapper = {
+export const RequestReportCollection: coreHttp.CompositeMapper = {
   serializedName: "RequestReportCollection",
   type: {
     name: "Composite",
@@ -10236,7 +10236,7 @@ export const RequestReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityCollection: msRest.CompositeMapper = {
+export const UserIdentityCollection: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityCollection",
   type: {
     name: "Composite",
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index b300ade09092..d21da1dce55a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
@@ -8,9 +8,9 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 
-export const acceptLanguage: msRest.OperationParameter = {
+export const acceptLanguage: coreHttp.OperationParameter = {
   parameterPath: "acceptLanguage",
   mapper: {
     serializedName: "accept-language",
@@ -20,7 +20,7 @@ export const acceptLanguage: msRest.OperationParameter = {
     }
   }
 };
-export const accessName: msRest.OperationURLParameter = {
+export const accessName: coreHttp.OperationURLParameter = {
   parameterPath: "accessName",
   mapper: {
     required: true,
@@ -32,7 +32,7 @@ export const accessName: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId0: msRest.OperationURLParameter = {
+export const apiId0: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
@@ -47,22 +47,21 @@ export const apiId0: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId1: msRest.OperationURLParameter = {
+export const apiId1: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
     serializedName: "apiId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const apiVersion: msRest.OperationQueryParameter = {
+export const apiVersion: coreHttp.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
@@ -72,7 +71,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
     }
   }
 };
-export const attachmentId: msRest.OperationURLParameter = {
+export const attachmentId: coreHttp.OperationURLParameter = {
   parameterPath: "attachmentId",
   mapper: {
     required: true,
@@ -87,7 +86,7 @@ export const attachmentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const authsid: msRest.OperationURLParameter = {
+export const authsid: coreHttp.OperationURLParameter = {
   parameterPath: "authsid",
   mapper: {
     required: true,
@@ -102,22 +101,21 @@ export const authsid: msRest.OperationURLParameter = {
     }
   }
 };
-export const backendId: msRest.OperationURLParameter = {
+export const backendId: coreHttp.OperationURLParameter = {
   parameterPath: "backendId",
   mapper: {
     required: true,
     serializedName: "backendId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const cacheId: msRest.OperationURLParameter = {
+export const cacheId: coreHttp.OperationURLParameter = {
   parameterPath: "cacheId",
   mapper: {
     required: true,
@@ -132,7 +130,7 @@ export const cacheId: msRest.OperationURLParameter = {
     }
   }
 };
-export const certificateId: msRest.OperationURLParameter = {
+export const certificateId: coreHttp.OperationURLParameter = {
   parameterPath: "certificateId",
   mapper: {
     required: true,
@@ -147,7 +145,7 @@ export const certificateId: msRest.OperationURLParameter = {
     }
   }
 };
-export const commentId: msRest.OperationURLParameter = {
+export const commentId: coreHttp.OperationURLParameter = {
   parameterPath: "commentId",
   mapper: {
     required: true,
@@ -162,7 +160,7 @@ export const commentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const configurationName: msRest.OperationURLParameter = {
+export const configurationName: coreHttp.OperationURLParameter = {
   parameterPath: "configurationName",
   mapper: {
     required: true,
@@ -174,7 +172,7 @@ export const configurationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const deleteRevisions: msRest.OperationQueryParameter = {
+export const deleteRevisions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteRevisions"
@@ -186,7 +184,7 @@ export const deleteRevisions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const deleteSubscriptions: msRest.OperationQueryParameter = {
+export const deleteSubscriptions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteSubscriptions"
@@ -198,7 +196,7 @@ export const deleteSubscriptions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const diagnosticId: msRest.OperationURLParameter = {
+export const diagnosticId: coreHttp.OperationURLParameter = {
   parameterPath: "diagnosticId",
   mapper: {
     required: true,
@@ -213,7 +211,7 @@ export const diagnosticId: msRest.OperationURLParameter = {
     }
   }
 };
-export const email: msRest.OperationURLParameter = {
+export const email: coreHttp.OperationURLParameter = {
   parameterPath: "email",
   mapper: {
     required: true,
@@ -223,7 +221,7 @@ export const email: msRest.OperationURLParameter = {
     }
   }
 };
-export const expandApiVersionSet: msRest.OperationQueryParameter = {
+export const expandApiVersionSet: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandApiVersionSet"
@@ -235,7 +233,7 @@ export const expandApiVersionSet: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandCommentsAttachments: msRest.OperationQueryParameter = {
+export const expandCommentsAttachments: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandCommentsAttachments"
@@ -247,7 +245,7 @@ export const expandCommentsAttachments: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandGroups: msRest.OperationQueryParameter = {
+export const expandGroups: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandGroups"
@@ -259,7 +257,7 @@ export const expandGroups: msRest.OperationQueryParameter = {
     }
   }
 };
-export const exportParameter: msRest.OperationQueryParameter = {
+export const exportParameter: coreHttp.OperationQueryParameter = {
   parameterPath: "exportParameter",
   mapper: {
     required: true,
@@ -271,7 +269,7 @@ export const exportParameter: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter0: msRest.OperationQueryParameter = {
+export const filter0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "filter"
@@ -283,7 +281,7 @@ export const filter0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter1: msRest.OperationQueryParameter = {
+export const filter1: coreHttp.OperationQueryParameter = {
   parameterPath: "filter",
   mapper: {
     required: true,
@@ -293,7 +291,7 @@ export const filter1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const force: msRest.OperationQueryParameter = {
+export const force: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "force"
@@ -305,7 +303,7 @@ export const force: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format0: msRest.OperationQueryParameter = {
+export const format0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "format"
@@ -318,7 +316,7 @@ export const format0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format1: msRest.OperationQueryParameter = {
+export const format1: coreHttp.OperationQueryParameter = {
   parameterPath: "format",
   mapper: {
     required: true,
@@ -328,22 +326,21 @@ export const format1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const groupId: msRest.OperationURLParameter = {
+export const groupId: coreHttp.OperationURLParameter = {
   parameterPath: "groupId",
   mapper: {
     required: true,
     serializedName: "groupId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const identityProviderName: msRest.OperationURLParameter = {
+export const identityProviderName: coreHttp.OperationURLParameter = {
   parameterPath: "identityProviderName",
   mapper: {
     required: true,
@@ -353,7 +350,7 @@ export const identityProviderName: msRest.OperationURLParameter = {
     }
   }
 };
-export const ifMatch0: msRest.OperationParameter = {
+export const ifMatch0: coreHttp.OperationParameter = {
   parameterPath: [
     "options",
     "ifMatch"
@@ -365,7 +362,7 @@ export const ifMatch0: msRest.OperationParameter = {
     }
   }
 };
-export const ifMatch1: msRest.OperationParameter = {
+export const ifMatch1: coreHttp.OperationParameter = {
   parameterPath: "ifMatch",
   mapper: {
     required: true,
@@ -375,7 +372,7 @@ export const ifMatch1: msRest.OperationParameter = {
     }
   }
 };
-export const includeNotTaggedApis: msRest.OperationQueryParameter = {
+export const includeNotTaggedApis: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedApis"
@@ -387,7 +384,7 @@ export const includeNotTaggedApis: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
+export const includeNotTaggedOperations: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedOperations"
@@ -399,7 +396,7 @@ export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
+export const includeNotTaggedProducts: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedProducts"
@@ -411,7 +408,7 @@ export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
     }
   }
 };
-export const interval: msRest.OperationQueryParameter = {
+export const interval: coreHttp.OperationQueryParameter = {
   parameterPath: "interval",
   mapper: {
     required: true,
@@ -421,7 +418,7 @@ export const interval: msRest.OperationQueryParameter = {
     }
   }
 };
-export const issueId: msRest.OperationURLParameter = {
+export const issueId: coreHttp.OperationURLParameter = {
   parameterPath: "issueId",
   mapper: {
     required: true,
@@ -436,7 +433,7 @@ export const issueId: msRest.OperationURLParameter = {
     }
   }
 };
-export const locationName: msRest.OperationURLParameter = {
+export const locationName: coreHttp.OperationURLParameter = {
   parameterPath: "locationName",
   mapper: {
     required: true,
@@ -449,7 +446,7 @@ export const locationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const loggerId: msRest.OperationURLParameter = {
+export const loggerId: coreHttp.OperationURLParameter = {
   parameterPath: "loggerId",
   mapper: {
     required: true,
@@ -463,7 +460,7 @@ export const loggerId: msRest.OperationURLParameter = {
     }
   }
 };
-export const nextPageLink: msRest.OperationURLParameter = {
+export const nextPageLink: coreHttp.OperationURLParameter = {
   parameterPath: "nextPageLink",
   mapper: {
     required: true,
@@ -474,7 +471,7 @@ export const nextPageLink: msRest.OperationURLParameter = {
   },
   skipEncoding: true
 };
-export const notificationName: msRest.OperationURLParameter = {
+export const notificationName: coreHttp.OperationURLParameter = {
   parameterPath: "notificationName",
   mapper: {
     required: true,
@@ -484,7 +481,7 @@ export const notificationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const notify: msRest.OperationQueryParameter = {
+export const notify: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "notify"
@@ -496,22 +493,21 @@ export const notify: msRest.OperationQueryParameter = {
     }
   }
 };
-export const operationId: msRest.OperationURLParameter = {
+export const operationId: coreHttp.OperationURLParameter = {
   parameterPath: "operationId",
   mapper: {
     required: true,
     serializedName: "operationId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const opid: msRest.OperationURLParameter = {
+export const opid: coreHttp.OperationURLParameter = {
   parameterPath: "opid",
   mapper: {
     required: true,
@@ -525,7 +521,7 @@ export const opid: msRest.OperationURLParameter = {
     }
   }
 };
-export const orderby: msRest.OperationQueryParameter = {
+export const orderby: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "orderby"
@@ -537,7 +533,7 @@ export const orderby: msRest.OperationQueryParameter = {
     }
   }
 };
-export const policyId: msRest.OperationURLParameter = {
+export const policyId: coreHttp.OperationURLParameter = {
   parameterPath: "policyId",
   mapper: {
     required: true,
@@ -549,22 +545,21 @@ export const policyId: msRest.OperationURLParameter = {
     }
   }
 };
-export const productId: msRest.OperationURLParameter = {
+export const productId: coreHttp.OperationURLParameter = {
   parameterPath: "productId",
   mapper: {
     required: true,
     serializedName: "productId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const propId: msRest.OperationURLParameter = {
+export const propId: coreHttp.OperationURLParameter = {
   parameterPath: "propId",
   mapper: {
     required: true,
@@ -578,7 +573,7 @@ export const propId: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaCounterKey: msRest.OperationURLParameter = {
+export const quotaCounterKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaCounterKey",
   mapper: {
     required: true,
@@ -588,7 +583,7 @@ export const quotaCounterKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaPeriodKey: msRest.OperationURLParameter = {
+export const quotaPeriodKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaPeriodKey",
   mapper: {
     required: true,
@@ -598,7 +593,7 @@ export const quotaPeriodKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const releaseId: msRest.OperationURLParameter = {
+export const releaseId: coreHttp.OperationURLParameter = {
   parameterPath: "releaseId",
   mapper: {
     required: true,
@@ -613,7 +608,7 @@ export const releaseId: msRest.OperationURLParameter = {
     }
   }
 };
-export const resourceGroupName: msRest.OperationURLParameter = {
+export const resourceGroupName: coreHttp.OperationURLParameter = {
   parameterPath: "resourceGroupName",
   mapper: {
     required: true,
@@ -623,7 +618,7 @@ export const resourceGroupName: msRest.OperationURLParameter = {
     }
   }
 };
-export const schemaId: msRest.OperationURLParameter = {
+export const schemaId: coreHttp.OperationURLParameter = {
   parameterPath: "schemaId",
   mapper: {
     required: true,
@@ -638,7 +633,7 @@ export const schemaId: msRest.OperationURLParameter = {
     }
   }
 };
-export const scope0: msRest.OperationQueryParameter = {
+export const scope0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -650,7 +645,7 @@ export const scope0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const scope1: msRest.OperationQueryParameter = {
+export const scope1: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -669,7 +664,7 @@ export const scope1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const serviceName: msRest.OperationURLParameter = {
+export const serviceName: coreHttp.OperationURLParameter = {
   parameterPath: "serviceName",
   mapper: {
     required: true,
@@ -684,7 +679,7 @@ export const serviceName: msRest.OperationURLParameter = {
     }
   }
 };
-export const sid: msRest.OperationURLParameter = {
+export const sid: coreHttp.OperationURLParameter = {
   parameterPath: "sid",
   mapper: {
     required: true,
@@ -698,7 +693,7 @@ export const sid: msRest.OperationURLParameter = {
     }
   }
 };
-export const skip: msRest.OperationQueryParameter = {
+export const skip: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "skip"
@@ -713,7 +708,7 @@ export const skip: msRest.OperationQueryParameter = {
     }
   }
 };
-export const subscriptionId: msRest.OperationURLParameter = {
+export const subscriptionId: coreHttp.OperationURLParameter = {
   parameterPath: "subscriptionId",
   mapper: {
     required: true,
@@ -723,7 +718,7 @@ export const subscriptionId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tagId: msRest.OperationURLParameter = {
+export const tagId: coreHttp.OperationURLParameter = {
   parameterPath: "tagId",
   mapper: {
     required: true,
@@ -738,7 +733,7 @@ export const tagId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tags: msRest.OperationQueryParameter = {
+export const tags: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "tags"
@@ -750,7 +745,7 @@ export const tags: msRest.OperationQueryParameter = {
     }
   }
 };
-export const templateName: msRest.OperationURLParameter = {
+export const templateName: coreHttp.OperationURLParameter = {
   parameterPath: "templateName",
   mapper: {
     required: true,
@@ -760,7 +755,7 @@ export const templateName: msRest.OperationURLParameter = {
     }
   }
 };
-export const top: msRest.OperationQueryParameter = {
+export const top: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "top"
@@ -775,22 +770,21 @@ export const top: msRest.OperationQueryParameter = {
     }
   }
 };
-export const userId: msRest.OperationURLParameter = {
+export const userId: coreHttp.OperationURLParameter = {
   parameterPath: "userId",
   mapper: {
     required: true,
     serializedName: "userId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const versionSetId: msRest.OperationURLParameter = {
+export const versionSetId: coreHttp.OperationURLParameter = {
   parameterPath: "versionSetId",
   mapper: {
     required: true,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..62893a65e480 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiMappers";
 import * as Parameters from "../models/parameters";
@@ -40,15 +40,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,9 +162,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -175,7 +175,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -211,9 +211,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -223,7 +223,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,15 +261,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,9 +288,9 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param parameters Create or update parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -337,19 +337,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -361,8 +361,8 @@ export class Api {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis",
   urlParameters: [
@@ -392,7 +392,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -445,7 +445,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -477,7 +477,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -504,7 +504,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apisByTags",
   urlParameters: [
@@ -533,7 +533,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -575,7 +575,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -596,7 +596,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
index aac5ab05ff5e..e4834d6ce0c4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiDiagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiDiagnostic {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -72,7 +72,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,7 +81,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -115,7 +115,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,7 +124,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -134,8 +134,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ export class ApiDiagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -206,9 +206,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -220,7 +220,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -233,8 +233,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -259,9 +259,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -272,7 +272,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -305,19 +305,19 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -329,8 +329,8 @@ export class ApiDiagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics",
   urlParameters: [
@@ -359,7 +359,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -414,7 +414,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -454,7 +454,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -487,7 +487,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -514,7 +514,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
index eccbf4429a22..9ea84a86b30c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiExportMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiExport {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiExportGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class ApiExport {
    * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'Openapi'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class ApiExport {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiExportResult>, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiExportResult>, callback?: coreHttp.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -75,8 +75,8 @@ export class ApiExport {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..527626919d80 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiIssue {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,7 +161,7 @@ export class ApiIssue {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -171,8 +171,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -196,9 +196,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -209,7 +209,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -221,8 +221,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,9 +246,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -258,7 +258,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -269,8 +269,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -290,19 +290,19 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -314,8 +314,8 @@ export class ApiIssue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues",
   urlParameters: [
@@ -345,7 +345,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -401,7 +401,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -474,7 +474,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -501,7 +501,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
index 9392f644c44d..d4098f4441ba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueAttachmentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueAttachment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueAttachment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueAttachment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueAttachment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueAttachment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
index 8f4584a711ee..9938dad7fa57 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueCommentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueComment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueComment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueComment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueComment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueComment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
index 043449470e76..4b4a2370c112 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -31,17 +31,17 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -56,19 +56,19 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -80,8 +80,8 @@ export class ApiManagementOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "providers/Microsoft.ApiManagement/operations",
   queryParameters: [
@@ -101,7 +101,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
index e098f991f33b..4def1deb0c6a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceRestoreResponse>
    */
-  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
+  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
     return this.beginRestore(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceRestoreResponse>;
   }
@@ -52,7 +52,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceBackupResponse>
    */
-  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
+  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
     return this.beginBackup(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceBackupResponse>;
   }
@@ -66,7 +66,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
     return this.beginCreateOrUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceCreateOrUpdateResponse>;
   }
@@ -79,7 +79,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
     return this.beginUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceUpdateResponse>;
   }
@@ -91,21 +91,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceResource>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceResource>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -123,7 +123,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceDeleteMethodResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
     return this.beginDeleteMethod(resourceGroupName,serviceName,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceDeleteMethodResponse>;
   }
@@ -134,19 +134,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupResponse>
    */
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
+  listByResourceGroup(resourceGroupName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,17 +161,17 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -187,21 +187,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetSsoTokenResponse>
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
+  getSsoToken(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,19 +218,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
     return this.client.sendOperationRequest(
       {
         parameters,
@@ -262,9 +262,9 @@ export class ApiManagementService {
    * @param parameters Parameters supplied to the Restore API Management service from backup
    * operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the ApiManagementService_Backup operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -304,9 +304,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -324,9 +324,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -343,9 +343,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -362,9 +362,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -381,19 +381,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>
    */
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
+  listByResourceGroupNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -409,19 +409,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -433,8 +433,8 @@ export class ApiManagementService {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -459,7 +459,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByResourceGroupOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -483,7 +483,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listOperationSpec: msRest.OperationSpec = {
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -506,7 +506,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSsoTokenOperationSpec: msRest.OperationSpec = {
+const getSsoTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/getssotoken",
   urlParameters: [
@@ -531,7 +531,7 @@ const getSsoTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
+const checkNameAvailabilityOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/checkNameAvailability",
   urlParameters: [
@@ -561,7 +561,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginRestoreOperationSpec: msRest.OperationSpec = {
+const beginRestoreOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore",
   urlParameters: [
@@ -594,7 +594,7 @@ const beginRestoreOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginBackupOperationSpec: msRest.OperationSpec = {
+const beginBackupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup",
   urlParameters: [
@@ -627,7 +627,7 @@ const beginBackupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -663,7 +663,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginUpdateOperationSpec: msRest.OperationSpec = {
+const beginUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -696,7 +696,7 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
+const beginDeleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -723,7 +723,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec = {
+const beginApplyNetworkConfigurationUpdatesOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/applynetworkconfigurationupdates",
   urlParameters: [
@@ -756,7 +756,7 @@ const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec =
   serializer
 };
 
-const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -777,7 +777,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
index 4ed93c82e480..4df1cfc2e754 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceSkusMappers";
 import * as Parameters from "../models/parameters";
@@ -34,21 +34,21 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,19 +66,19 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
+  listAvailableServiceSkusNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -90,8 +90,8 @@ export class ApiManagementServiceSkus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listAvailableServiceSkusOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/skus",
   urlParameters: [
@@ -116,7 +116,7 @@ const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listAvailableServiceSkusNextOperationSpec: msRest.OperationSpec = {
+const listAvailableServiceSkusNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
index 02d3a4495eeb..ddffaedd4f02 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiOperation {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiOperation {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,9 +219,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,7 +234,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -248,8 +248,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -275,9 +275,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -289,7 +289,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -323,19 +323,19 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -347,8 +347,8 @@ export class ApiOperation {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations",
   urlParameters: [
@@ -378,7 +378,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -433,7 +433,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -473,7 +473,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -506,7 +506,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -533,7 +533,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
index 7e7f6bd110f5..d88c547584b8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyListByOperationResponse>
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,7 +93,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -104,8 +104,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -150,8 +150,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -187,7 +187,7 @@ export class ApiOperationPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -199,8 +199,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class ApiOperationPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -239,7 +239,7 @@ export class ApiOperationPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -252,8 +252,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,8 +269,8 @@ export class ApiOperationPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies",
   urlParameters: [
@@ -297,7 +297,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -325,7 +325,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -355,7 +355,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -396,7 +396,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
index 4d5ddbc68485..bf30180cb129 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyListByApiResponse>
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ApiPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ApiPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ApiPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ApiPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
index 10e07fb486f2..4c89bf24cdf0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiProductMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiProduct {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiProduct {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiProduct {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiProductListByApisNextResponse>
    */
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
+  listByApisNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiProduct {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApisOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApisOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/products",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByApisOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApisNextOperationSpec: msRest.OperationSpec = {
+const listByApisNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
index f0d3cedeb6d3..5b56128c5d1a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiReleaseMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiRelease {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -51,8 +51,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -83,7 +83,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,8 +93,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -126,7 +126,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -136,8 +136,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,7 +171,7 @@ export class ApiRelease {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -182,8 +182,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -208,9 +208,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -235,8 +235,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,9 +261,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -274,7 +274,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -333,8 +333,8 @@ export class ApiRelease {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases",
   urlParameters: [
@@ -363,7 +363,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -390,7 +390,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -491,7 +491,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -518,7 +518,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
index 837ccbc609f9..7aefdbed97bf 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiRevisionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiRevision {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiRevision {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiRevision {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiRevisionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiRevision {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/revisions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
index da91eb979f4d..5ec72748bd7f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiSchemaMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiSchema {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiSchema {
    * @param parameters The schema contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,9 +218,9 @@ export class ApiSchema {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -232,7 +232,7 @@ export class ApiSchema {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,8 +245,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class ApiSchema {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas",
   urlParameters: [
@@ -320,7 +320,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -347,7 +347,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -375,7 +375,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -415,7 +415,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
index dd13e851c706..7a81f3426756 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiTagDescriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -44,7 +44,7 @@ export class ApiTagDescription {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -53,8 +53,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,7 +85,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,8 +95,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,7 +128,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -138,8 +138,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ApiTagDescription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -184,8 +184,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,9 +209,9 @@ export class ApiTagDescription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiTagDescription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -256,19 +256,19 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -280,8 +280,8 @@ export class ApiTagDescription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions",
   urlParameters: [
@@ -310,7 +310,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -365,7 +365,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -432,7 +432,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
index 5f6861172541..b1c965b849a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiVersionSetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class ApiVersionSet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class ApiVersionSet {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class ApiVersionSet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 8a3182d35653..26d8f5932dac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/authorizationServerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class AuthorizationServer {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class AuthorizationServer {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class AuthorizationServer {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..eb5e19210589 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/backendMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Backend {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetResponse>;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
+  get(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Backend {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Backend {
    * @param backendId Identifier of the Backend entity. Must be unique in the current API Management
    * service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<msRest.RestResponse>;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,19 +321,19 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -345,8 +345,8 @@ export class Backend {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends",
   urlParameters: [
@@ -374,7 +374,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -400,7 +400,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -427,7 +427,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -466,7 +466,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -498,7 +498,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -524,7 +524,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const reconnectOperationSpec: msRest.OperationSpec = {
+const reconnectOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}/reconnect",
   urlParameters: [
@@ -555,7 +555,7 @@ const reconnectOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..0229ff2d39ac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/cacheMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Cache {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetResponse>;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Cache {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Cache {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches",
   urlParameters: [
@@ -333,7 +333,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -359,7 +359,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -425,7 +425,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -457,7 +457,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -483,7 +483,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
index f47a28ce34f4..2cee16d8e3fe 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/certificateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Certificate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Certificate {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,9 +188,9 @@ export class Certificate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -200,7 +200,7 @@ export class Certificate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -211,8 +211,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -231,19 +231,19 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -255,8 +255,8 @@ export class Certificate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates",
   urlParameters: [
@@ -284,7 +284,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -310,7 +310,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -376,7 +376,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -402,7 +402,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
index e1289ca3ddd1..47fe7384cdb0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/delegationSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class DelegationSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class DelegationSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class DelegationSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class DelegationSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..c537d80aeea7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/diagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Diagnostic {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Diagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Diagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..feac8aa81707 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/emailTemplateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class EmailTemplate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,7 +73,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -87,7 +87,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -102,8 +102,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -130,7 +130,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -144,7 +144,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,8 +159,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class EmailTemplate {
    * @param parameters Email Template update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -219,8 +219,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -249,9 +249,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -268,7 +268,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -316,9 +316,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,7 +334,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -351,8 +351,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -371,19 +371,19 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -395,8 +395,8 @@ export class EmailTemplate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates",
   urlParameters: [
@@ -424,7 +424,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -477,7 +477,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -514,7 +514,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -546,7 +546,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -572,7 +572,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..f3e9fed92627 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Group {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetResponse>;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
+  get(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Group {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Group {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
index 819dff540d27..5a1f81e9495c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupUserMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
+  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -111,7 +111,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCreateResponse>
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,7 +119,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -149,9 +149,9 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,7 +159,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -168,8 +168,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,19 +188,19 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -212,8 +212,8 @@ export class GroupUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users",
   urlParameters: [
@@ -242,7 +242,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -268,7 +268,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOperationSpec: msRest.OperationSpec = {
+const createOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -298,7 +298,7 @@ const createOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -324,7 +324,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index a9dc72ce8502..6881b4086f45 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/identityProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class IdentityProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -282,19 +282,19 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -306,8 +306,8 @@ export class IdentityProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders",
   urlParameters: [
@@ -332,7 +332,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -358,7 +358,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -385,7 +385,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -424,7 +424,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -456,7 +456,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -482,7 +482,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
index 74263bc8328b..5bf06e0ce889 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/issueMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Issue {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueGetResponse>;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Issue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -100,19 +100,19 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -124,8 +124,8 @@ export class Issue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues",
   urlParameters: [
@@ -153,7 +153,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues/{issueId}",
   urlParameters: [
@@ -180,7 +180,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
index ceea06065217..d32282984e6c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/loggerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Logger {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Logger {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Logger {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -470,7 +470,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
index 4a2e2f094b53..2e3813915fc3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/networkStatusMappers";
 import * as Parameters from "../models/parameters";
@@ -35,21 +35,21 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByLocationResponse>
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class NetworkStatus {
    * Azure Regions like West US, East US, South Central US.
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class NetworkStatus {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContract>, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContract>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -103,8 +103,8 @@ export class NetworkStatus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/networkstatus",
   urlParameters: [
@@ -140,7 +140,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByLocationOperationSpec: msRest.OperationSpec = {
+const listByLocationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/locations/{locationName}/networkstatus",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
index ee40ffce7f34..de481b030736 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Notification {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -69,7 +69,7 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -90,8 +90,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -135,8 +135,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -154,19 +154,19 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -178,8 +178,8 @@ export class Notification {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications",
   urlParameters: [
@@ -206,7 +206,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -232,7 +232,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -259,7 +259,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
index 33904e45df9c..ebfd03f497fd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientEmailMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailCollection>, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailContract>, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailContract>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param email Email identifier.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientEmail {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
index 0f5df0fb3ac3..0cfc112d1d85 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientUserMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserCollection>, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserContract>, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserContract>, callback?: coreHttp.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
index 6b7772a13ea3..200f347aa0f1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/openIdConnectProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class OpenIdConnectProvider {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class OpenIdConnectProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class OpenIdConnectProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
index 770b86b58870..7338254dd123 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/operationOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class OperationOperations {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class OperationOperations {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class OperationOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.OperationListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class OperationOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operationsByTags",
   urlParameters: [
@@ -126,7 +126,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
index f9736328e80a..b9e89e968493 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policyMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,21 +66,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -104,15 +104,15 @@ export class Policy {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,7 +138,7 @@ export class Policy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -146,8 +146,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class Policy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -176,7 +176,7 @@ export class Policy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -185,8 +185,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,8 +200,8 @@ export class Policy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies",
   urlParameters: [
@@ -226,7 +226,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -252,7 +252,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -280,7 +280,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -319,7 +319,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
index d0ba7845bb1f..74b9659c45b9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policySnippetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class PolicySnippet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicySnippetsCollection>, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PolicySnippetsCollection>, callback?: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -60,8 +60,8 @@ export class PolicySnippet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policySnippets",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
index 31904c098334..173a8de78133 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetResponse>;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Product {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,15 +288,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -313,19 +313,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -341,19 +341,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -365,8 +365,8 @@ export class Product {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products",
   urlParameters: [
@@ -396,7 +396,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -422,7 +422,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -449,7 +449,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -488,7 +488,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -520,7 +520,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -547,7 +547,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/productsByTags",
   urlParameters: [
@@ -576,7 +576,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -597,7 +597,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
index c3bad7380501..29721dc07229 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productApiMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductApi {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,9 +74,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -178,7 +178,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -189,8 +189,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,19 +209,19 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -233,8 +233,8 @@ export class ProductApi {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis",
   urlParameters: [
@@ -263,7 +263,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -318,7 +318,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -344,7 +344,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
index d40911e555c8..67f7c51eda2e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductGroup {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,9 +73,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,7 +84,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,8 +94,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -127,7 +127,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -137,8 +137,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -159,9 +159,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -170,7 +170,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,19 +200,19 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -224,8 +224,8 @@ export class ProductGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups",
   urlParameters: [
@@ -254,7 +254,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -279,7 +279,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -309,7 +309,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -335,7 +335,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
index bd7e68b41ad9..a47a83954212 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyListByProductResponse>
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ProductPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ProductPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ProductPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ProductPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
index df3e0fbae8f6..78ae6452d116 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productSubscriptionsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductSubscriptions {
    * instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductSubscriptions {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class ProductSubscriptions {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductSubscriptionsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class ProductSubscriptions {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/subscriptions",
   urlParameters: [
@@ -125,7 +125,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
index af83fe7a925d..432482302489 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/propertyMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Property {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Property {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Property {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
index e4976fa216f6..06ca471204a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByCounterKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class QuotaByCounterKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByCounterKeysListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterCollection>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,9 +83,9 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,7 +96,7 @@ export class QuotaByCounterKeys {
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -108,8 +108,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class QuotaByCounterKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
@@ -151,7 +151,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..41f8e762396b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByPeriodKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -39,7 +39,7 @@ export class QuotaByPeriodKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByPeriodKeysGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -50,7 +50,7 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -62,8 +62,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterContract>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -87,9 +87,9 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -101,7 +101,7 @@ export class QuotaByPeriodKeys {
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,8 +114,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,8 +131,8 @@ export class QuotaByPeriodKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
@@ -159,7 +159,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
index a563773df876..12217e5f5dd2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/regionMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class Region {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/regions",
   urlParameters: [
@@ -114,7 +114,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
index 328d1f592dab..2f5ab070e0e2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/reportsMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class Reports {
    * @param filter The filter to apply on the operation.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -101,7 +101,7 @@ export class Reports {
    * | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -121,8 +121,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -193,8 +193,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -243,7 +243,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -314,7 +314,7 @@ export class Reports {
    * | </br>
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,8 +334,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -384,7 +384,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -403,8 +403,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -461,7 +461,7 @@ export class Reports {
    * TimeSpan(hours, minutes, seconds)).
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -484,8 +484,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -521,7 +521,7 @@ export class Reports {
    * filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -533,8 +533,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | msRest.ServiceCallback<Models.RequestReportCollection>, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | coreHttp.ServiceCallback<Models.RequestReportCollection>, callback?: coreHttp.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -552,19 +552,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -580,19 +580,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByUserNextResponse>
    */
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
+  listByUserNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -608,19 +608,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -636,19 +636,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -664,19 +664,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByGeoNextResponse>
    */
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
+  listByGeoNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -692,19 +692,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListBySubscriptionNextResponse>
    */
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
+  listBySubscriptionNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -720,19 +720,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByTimeNextResponse>
    */
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
+  listByTimeNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -744,8 +744,8 @@ export class Reports {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byApi",
   urlParameters: [
@@ -774,7 +774,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserOperationSpec: msRest.OperationSpec = {
+const listByUserOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byUser",
   urlParameters: [
@@ -803,7 +803,7 @@ const listByUserOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byOperation",
   urlParameters: [
@@ -832,7 +832,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byProduct",
   urlParameters: [
@@ -861,7 +861,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoOperationSpec: msRest.OperationSpec = {
+const listByGeoOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byGeo",
   urlParameters: [
@@ -889,7 +889,7 @@ const listByGeoOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/bySubscription",
   urlParameters: [
@@ -918,7 +918,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeOperationSpec: msRest.OperationSpec = {
+const listByTimeOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byTime",
   urlParameters: [
@@ -948,7 +948,7 @@ const listByTimeOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByRequestOperationSpec: msRest.OperationSpec = {
+const listByRequestOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byRequest",
   urlParameters: [
@@ -976,7 +976,7 @@ const listByRequestOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -997,7 +997,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserNextOperationSpec: msRest.OperationSpec = {
+const listByUserNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1018,7 +1018,7 @@ const listByUserNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1039,7 +1039,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1060,7 +1060,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoNextOperationSpec: msRest.OperationSpec = {
+const listByGeoNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1081,7 +1081,7 @@ const listByGeoNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1102,7 +1102,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeNextOperationSpec: msRest.OperationSpec = {
+const listByTimeNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
index dd971ea317b3..aa821fe29d3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signInSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignInSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignInSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignInSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignInSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
index bd3214a4dffd..036908e63887 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signUpSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignUpSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignUpSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignUpSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignUpSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
index 630cfbf109fc..c665a6438d1f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/subscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Subscription {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class Subscription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -322,9 +322,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -332,7 +332,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -341,8 +341,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -360,19 +360,19 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -384,8 +384,8 @@ export class Subscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions",
   urlParameters: [
@@ -413,7 +413,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -439,7 +439,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -466,7 +466,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -506,7 +506,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -539,7 +539,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -565,7 +565,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regeneratePrimaryKey",
   urlParameters: [
@@ -589,7 +589,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regenerateSecondaryKey",
   urlParameters: [
@@ -613,7 +613,7 @@ const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..b8b1bf0c9d72 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagMappers";
 import * as Parameters from "../models/parameters";
@@ -47,7 +47,7 @@ export class Tag {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -84,7 +84,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByOperationResponse>
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,7 +95,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -107,8 +107,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -134,7 +134,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByOperationResponse>
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -145,7 +145,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -157,8 +157,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -184,7 +184,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToOperationResponse>
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -195,7 +195,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,8 +207,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -232,9 +232,9 @@ export class Tag {
    * Management service instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,7 +245,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -257,8 +257,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -289,7 +289,7 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -298,8 +298,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,7 +321,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByApiResponse>
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -330,7 +330,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -340,8 +340,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -364,7 +364,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByApiResponse>
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -373,7 +373,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -383,8 +383,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -407,7 +407,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToApiResponse>
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -416,7 +416,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -426,8 +426,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -448,9 +448,9 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -459,7 +459,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -469,8 +469,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -500,7 +500,7 @@ export class Tag {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -509,8 +509,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -532,7 +532,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByProductResponse>
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -541,7 +541,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -551,8 +551,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -575,7 +575,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByProductResponse>
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -584,7 +584,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -594,8 +594,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -618,7 +618,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToProductResponse>
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -627,7 +627,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -637,8 +637,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -659,9 +659,9 @@ export class Tag {
    * instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -670,7 +670,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -680,8 +680,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -707,15 +707,15 @@ export class Tag {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -734,14 +734,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateResponse>
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -749,8 +749,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -770,14 +770,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetResponse>;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -785,8 +785,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
+  get(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -815,7 +815,7 @@ export class Tag {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -824,8 +824,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -847,9 +847,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -859,7 +859,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -870,8 +870,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -893,9 +893,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -904,7 +904,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -914,8 +914,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -934,19 +934,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -962,19 +962,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -990,19 +990,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1018,19 +1018,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1042,8 +1042,8 @@ export class Tag {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags",
   urlParameters: [
@@ -1073,7 +1073,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
+const getEntityStateByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1101,7 +1101,7 @@ const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByOperationOperationSpec: msRest.OperationSpec = {
+const getByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1130,7 +1130,7 @@ const getByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToOperationOperationSpec: msRest.OperationSpec = {
+const assignToOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1161,7 +1161,7 @@ const assignToOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromOperationOperationSpec: msRest.OperationSpec = {
+const detachFromOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1188,7 +1188,7 @@ const detachFromOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiOperationSpec: msRest.OperationSpec = {
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags",
   urlParameters: [
@@ -1217,7 +1217,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
+const getEntityStateByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1244,7 +1244,7 @@ const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByApiOperationSpec: msRest.OperationSpec = {
+const getByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1272,7 +1272,7 @@ const getByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToApiOperationSpec: msRest.OperationSpec = {
+const assignToApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1304,7 +1304,7 @@ const assignToApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromApiOperationSpec: msRest.OperationSpec = {
+const detachFromApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1330,7 +1330,7 @@ const detachFromApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags",
   urlParameters: [
@@ -1359,7 +1359,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
+const getEntityStateByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1386,7 +1386,7 @@ const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByProductOperationSpec: msRest.OperationSpec = {
+const getByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1414,7 +1414,7 @@ const getByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToProductOperationSpec: msRest.OperationSpec = {
+const assignToProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1444,7 +1444,7 @@ const assignToProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromProductOperationSpec: msRest.OperationSpec = {
+const detachFromProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1470,7 +1470,7 @@ const detachFromProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags",
   urlParameters: [
@@ -1499,7 +1499,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateOperationSpec: msRest.OperationSpec = {
+const getEntityStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1525,7 +1525,7 @@ const getEntityStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1552,7 +1552,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1591,7 +1591,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1623,7 +1623,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1649,7 +1649,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1670,7 +1670,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1691,7 +1691,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1712,7 +1712,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
index b662081c7fcb..174b64c28bd7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagResourceMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class TagResource {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class TagResource {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagResourceListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class TagResource {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tagResources",
   urlParameters: [
@@ -117,7 +117,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index 79018f752dfd..f4a53f233db4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class TenantAccess {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class TenantAccess {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class TenantAccess {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,23 +138,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -170,23 +170,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -199,8 +199,8 @@ export class TenantAccess {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -226,7 +226,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -253,7 +253,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -285,7 +285,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regeneratePrimaryKey",
   urlParameters: [
@@ -309,7 +309,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
index c7fbd0f24509..f29079060881 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessGitMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccessGit {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGitGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,23 +63,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -95,23 +95,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class TenantAccessGit {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git",
   urlParameters: [
@@ -152,7 +152,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regeneratePrimaryKey",
   urlParameters: [
@@ -176,7 +176,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
index be1e84173988..fefb4e8f6dd4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantConfigurationMappers";
 import * as Parameters from "../models/parameters";
@@ -36,7 +36,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationDeployResponse>
    */
-  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
+  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
     return this.beginDeploy(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationDeployResponse>;
   }
@@ -50,7 +50,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationSaveResponse>
    */
-  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
+  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
     return this.beginSave(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationSaveResponse>;
   }
@@ -64,7 +64,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationValidateResponse>
    */
-  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
+  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
     return this.beginValidate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationValidateResponse>;
   }
@@ -77,21 +77,21 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationGetSyncStateResponse>
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
+  getSyncState(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -109,9 +109,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Deploy Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -130,9 +130,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Save Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -151,9 +151,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Validate Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -167,8 +167,8 @@ export class TenantConfiguration {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getSyncStateOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getSyncStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/syncState",
   urlParameters: [
@@ -194,7 +194,7 @@ const getSyncStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeployOperationSpec: msRest.OperationSpec = {
+const beginDeployOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/deploy",
   urlParameters: [
@@ -228,7 +228,7 @@ const beginDeployOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginSaveOperationSpec: msRest.OperationSpec = {
+const beginSaveOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/save",
   urlParameters: [
@@ -262,7 +262,7 @@ const beginSaveOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginValidateOperationSpec: msRest.OperationSpec = {
+const beginValidateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/validate",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
index 43a8c279ccc7..3ea13cf17f4d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class User {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetResponse>;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
+  get(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class User {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,14 +269,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGenerateSsoUrlResponse>
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -306,7 +306,7 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetSharedAccessTokenResponse>
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -314,7 +314,7 @@ export class User {
    * @param parameters Create Authorization Token parameters.
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -323,8 +323,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserTokenResult>, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserTokenResult>, callback?: coreHttp.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -343,19 +343,19 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -367,8 +367,8 @@ export class User {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users",
   urlParameters: [
@@ -397,7 +397,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -423,7 +423,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -489,7 +489,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -521,7 +521,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -549,7 +549,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const generateSsoUrlOperationSpec: msRest.OperationSpec = {
+const generateSsoUrlOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl",
   urlParameters: [
@@ -575,7 +575,7 @@ const generateSsoUrlOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
+const getSharedAccessTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token",
   urlParameters: [
@@ -608,7 +608,7 @@ const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
index d9e3dbdaf146..a89f508bb26c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Mappers from "../models/userConfirmationPasswordMappers";
 import * as Parameters from "../models/parameters";
 import { ApiManagementClientContext } from "../apiManagementClientContext";
@@ -31,16 +31,16 @@ export class UserConfirmationPassword {
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,8 +48,8 @@ export class UserConfirmationPassword {
    * @param options The optional parameters
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  send(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,8 +63,8 @@ export class UserConfirmationPassword {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const sendOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const sendOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/confirmations/password/send",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
index 0387dbc52c58..2458f939727f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserGroup {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGroupListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/groups",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
index e84a1e21f620..292ac034ceb2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userIdentitiesMappers";
 import * as Parameters from "../models/parameters";
@@ -34,14 +34,14 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListResponse>
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserIdentities {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserIdentities {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/identities",
   urlParameters: [
@@ -119,7 +119,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
index bf8816577ff9..c75728d78f8f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userSubscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserSubscription {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserSubscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserSubscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserSubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserSubscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",

From 6bc44fa48ebba82b67e994bb43531e034f5ff63d Mon Sep 17 00:00:00 2001
From: chradek <51000525+chradek@users.noreply.github.com>
Date: Tue, 30 Jul 2019 16:06:32 -0700
Subject: [PATCH 22/24] [EPH] adds support for processing multiple partitions
 (#4535)

---
 .../event-hubs/review/event-hubs.api.md       |  77 +++-
 sdk/eventhub/event-hubs/src/eventProcessor.ts | 175 +++++++--
 sdk/eventhub/event-hubs/src/index.ts          |  11 +-
 sdk/eventhub/event-hubs/src/log.ts            |  10 +
 sdk/eventhub/event-hubs/src/partitionPump.ts  |  27 +-
 sdk/eventhub/event-hubs/src/pumpManager.ts    | 142 ++++++++
 .../event-hubs/src/util/cancellableDelay.ts   |  17 +
 .../event-hubs/test/eventProcessor.spec.ts    | 337 +++++++++++++++++-
 8 files changed, 747 insertions(+), 49 deletions(-)
 create mode 100644 sdk/eventhub/event-hubs/src/pumpManager.ts
 create mode 100644 sdk/eventhub/event-hubs/src/util/cancellableDelay.ts

diff --git a/sdk/eventhub/event-hubs/review/event-hubs.api.md b/sdk/eventhub/event-hubs/review/event-hubs.api.md
index be16758c5156..4639ba21abce 100644
--- a/sdk/eventhub/event-hubs/review/event-hubs.api.md
+++ b/sdk/eventhub/event-hubs/review/event-hubs.api.md
@@ -29,6 +29,20 @@ export interface BatchOptions {
     partitionKey?: string;
 }
 
+// @public
+export class CheckpointManager {
+    // (undocumented)
+    updateCheckpoint(eventData: EventData): Promise<void>;
+    // (undocumented)
+    updateCheckpoint(offset: string, sequenceNumber: number): Promise<void>;
+}
+
+// @public
+export enum CloseReason {
+    OwnershipLost = "OwnershipLost",
+    Shutdown = "Shutdown"
+}
+
 export { DataTransformer }
 
 export { DefaultDataTransformer }
@@ -149,14 +163,21 @@ export class EventPosition {
 
 // @public
 export class EventProcessor {
-    // Warning: (ae-forgotten-export) The symbol "PartitionProcessorFactory" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "PartitionManager" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "EventProcessorOptions" needs to be exported by the entry point index.d.ts
     constructor(consumerGroupName: string, eventHubClient: EventHubClient, partitionProcessorFactory: PartitionProcessorFactory, partitionManager: PartitionManager, options?: EventProcessorOptions);
-    start(): Promise<void>;
+    start(): void;
     stop(): Promise<void>;
 }
 
+// @public (undocumented)
+export interface EventProcessorOptions {
+    // (undocumented)
+    initialEventPosition?: EventPosition;
+    // (undocumented)
+    maxBatchSize?: number;
+    // (undocumented)
+    maxWaitTimeInSeconds?: number;
+}
+
 export { MessagingError }
 
 // @public
@@ -175,6 +196,54 @@ export interface PartitionContext {
     readonly partitionId: string;
 }
 
+// @public
+export interface PartitionManager {
+    // (undocumented)
+    claimOwnerships(partitionOwnerships: PartitionOwnership[]): Promise<PartitionOwnership[]>;
+    // Warning: (ae-forgotten-export) The symbol "Checkpoint" needs to be exported by the entry point index.d.ts
+    // 
+    // (undocumented)
+    createCheckpoint(checkpoint: Checkpoint): Promise<void>;
+    // (undocumented)
+    listOwnerships(eventHubName: string, consumerGroupName: string): Promise<PartitionOwnership[]>;
+}
+
+// @public
+export interface PartitionOwnership {
+    // (undocumented)
+    consumerGroupName: string;
+    // (undocumented)
+    ETag?: string;
+    // (undocumented)
+    eventHubName: string;
+    // (undocumented)
+    instanceId: string;
+    // (undocumented)
+    lastModifiedTime?: number;
+    // (undocumented)
+    offset?: number;
+    // (undocumented)
+    ownerLevel: number;
+    // (undocumented)
+    partitionId: string;
+    // (undocumented)
+    sequenceNumber?: number;
+}
+
+// @public (undocumented)
+export interface PartitionProcessor {
+    close?(reason: CloseReason): Promise<void>;
+    initialize?(): Promise<void>;
+    processError(error: Error): Promise<void>;
+    processEvents(events: EventData[]): Promise<void>;
+}
+
+// @public
+export interface PartitionProcessorFactory {
+    // (undocumented)
+    (context: PartitionContext, checkpointManager: CheckpointManager): PartitionProcessor;
+}
+
 // @public
 export interface PartitionProperties {
     beginningSequenceNumber: number;
diff --git a/sdk/eventhub/event-hubs/src/eventProcessor.ts b/sdk/eventhub/event-hubs/src/eventProcessor.ts
index 285fb43b1043..bba3db587fd2 100644
--- a/sdk/eventhub/event-hubs/src/eventProcessor.ts
+++ b/sdk/eventhub/event-hubs/src/eventProcessor.ts
@@ -1,12 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import uuid from "uuid/v4";
 import { EventHubClient } from "./eventHubClient";
 import { EventPosition } from "./eventPosition";
 import { PartitionContext } from "./partitionContext";
 import { CheckpointManager, Checkpoint } from "./checkpointManager";
 import { EventData } from "./eventData";
-import { PartitionPump } from "./partitionPump";
+import { PumpManager } from "./pumpManager";
+import { AbortSignalLike, AbortController } from "@azure/abort-controller";
+import * as log from "./log";
+import { cancellableDelay } from "./util/cancellableDelay";
+
+/**
+ * Reason for closing a PartitionProcessor.
+ */
+export enum CloseReason {
+  /**
+   * Ownership of the partition was lost or transitioned to a new processor instance.
+   */
+  OwnershipLost = "OwnershipLost",
+  /**
+   * The EventProcessor was shutdown.
+   */
+  Shutdown = "Shutdown",
+  /**
+   * The PartitionProcessor was shutdown for an unknown reason.
+   */
+  Unknown = "Unknown"
+}
 
 export interface PartitionProcessor {
   /**
@@ -18,7 +40,7 @@ export interface PartitionProcessor {
    * This may occur when control of the partition switches to another EPH or when user stops EPH
    * TODO: update string -> CloseReason
    */
-  close?(reason: string): Promise<void>;
+  close?(reason: CloseReason): Promise<void>;
   /**
    * Called when a batch of events have been received.
    */
@@ -79,7 +101,11 @@ export class EventProcessor {
   private _eventHubClient: EventHubClient;
   private _partitionProcessorFactory: PartitionProcessorFactory;
   private _processorOptions: EventProcessorOptions;
-  private _partitionPump?: PartitionPump;
+  private _pumpManager: PumpManager;
+  private _id: string = uuid();
+  private _isRunning: boolean = false;
+  private _loopTask?: PromiseLike<void>;
+  private _abortController?: AbortController;
 
   constructor(
     consumerGroupName: string,
@@ -94,6 +120,93 @@ export class EventProcessor {
     this._eventHubClient = eventHubClient;
     this._partitionProcessorFactory = partitionProcessorFactory;
     this._processorOptions = options;
+    this._pumpManager = new PumpManager(this._id, options);
+  }
+
+  private async _getInactivePartitions(): Promise<string[]> {
+    try {
+      // get all partition ids on the event hub
+      const partitionIds = await this._eventHubClient.getPartitionIds();
+      // get partitions this EventProcessor is actively processing
+      const activePartitionIds = this._pumpManager.receivingFromPartitions();
+
+      // get a list of partition ids that are not being processed by this EventProcessor
+      const inactivePartitionIds: string[] = partitionIds.filter(
+        (id) => activePartitionIds.indexOf(id) === -1
+      );
+      return inactivePartitionIds;
+    } catch (err) {
+      log.error(`[${this._id}] An error occured when retrieving partition ids: ${err}`);
+      throw err;
+    }
+  }
+
+  /**
+   * Starts the EventProcessor loop.
+   * Load-balancing and partition ownership should be checked inside the loop.
+   * @ignore
+   */
+  private async _runLoop(abortSignal: AbortSignalLike): Promise<void> {
+    // periodically check if there is any partition not being processed and process it
+    const waitIntervalInMs = 30000;
+    while (!abortSignal.aborted) {
+      try {
+        // get a list of partition ids that are not being processed by this EventProcessor
+        const partitionsToAdd = await this._getInactivePartitions();
+        // check if the loop has been cancelled
+        if (abortSignal.aborted) {
+          return;
+        }
+
+        const tasks: PromiseLike<void>[] = [];
+        // create partition pumps to process any partitions we should be processing
+        for (const partitionId of partitionsToAdd) {
+          const partitionContext: PartitionContext = {
+            consumerGroupName: this._consumerGroupName,
+            eventHubName: this._eventHubClient.eventHubName,
+            partitionId: partitionId
+          };
+
+          const checkpointManager = new CheckpointManager();
+
+          log.eventProcessor(
+            `[${this._id}] [${partitionId}] Calling user-provided PartitionProcessorFactory.`
+          );
+          const partitionProcessor = this._partitionProcessorFactory(
+            partitionContext,
+            checkpointManager
+          );
+
+          // eventually this will 1st check if the existing PartitionOwnership has a position
+          const eventPosition =
+            this._processorOptions.initialEventPosition || EventPosition.earliest();
+
+          tasks.push(
+            this._pumpManager.createPump(
+              this._eventHubClient,
+              partitionContext,
+              eventPosition,
+              partitionProcessor
+            )
+          );
+        }
+
+        // wait for all the new pumps to be created
+        await Promise.all(tasks);
+        log.eventProcessor(`[${this._id}] PartitionPumps created within EventProcessor.`);
+
+        // sleep
+        log.eventProcessor(
+          `[${this._id}] Pausing the EventProcessor loop for ${waitIntervalInMs} ms.`
+        );
+        await cancellableDelay(waitIntervalInMs, abortSignal);
+      } catch (err) {
+        log.error(`[${this._id}] An error occured within the EventProcessor loop: ${err}`);
+      }
+    }
+
+    // loop has completed, remove all existing pumps
+    return this._pumpManager.removeAllPumps(CloseReason.Shutdown);
   }
 
   /**
@@ -101,39 +214,18 @@ export class EventProcessor {
    * For each successful lease, it will get the details from the blob and start a receiver at the
    * point where it left off previously.
    *
-   * @return {Promise<void>}
+   * @return {void}
    */
-  async start(): Promise<void> {
-    const partitionIds = await this._eventHubClient.getPartitionIds();
-    const partitionContext: PartitionContext = {
-      partitionId: partitionIds[0],
-      consumerGroupName: this._consumerGroupName,
-      eventHubName: this._eventHubClient.eventHubName
-    };
-    const partitionProcessor = this._partitionProcessorFactory(
-      partitionContext,
-      new CheckpointManager()
-    );
-    if (partitionProcessor.initialize && typeof partitionProcessor.initialize !== "function") {
-      throw new TypeError("'initialize' must be of type 'function'.");
-    }
-    if (typeof partitionProcessor.processEvents !== "function") {
-      throw new TypeError("'processEvents' is required and must be of type 'function'.");
-    }
-    if (typeof partitionProcessor.processError !== "function") {
-      throw new TypeError("'processError' is required and must be of type 'function'.");
-    }
-    if (partitionProcessor.close && typeof partitionProcessor.close !== "function") {
-      throw new TypeError("'close' must be of type 'function'.");
+  start(): void {
+    if (this._isRunning) {
+      log.eventProcessor(`[${this._id}] Attempted to start an already running EventProcessor.`);
+      return;
     }
 
-    this._partitionPump = new PartitionPump(
-      this._eventHubClient,
-      partitionContext,
-      partitionProcessor,
-      this._processorOptions
-    );
-    await this._partitionPump.start(partitionIds[0]);
+    this._isRunning = true;
+    this._abortController = new AbortController();
+    log.eventProcessor(`[${this._id}] Starting an EventProcessor.`);
+    this._loopTask = this._runLoop(this._abortController.signal);
   }
 
   /**
@@ -141,8 +233,21 @@ export class EventProcessor {
    * @return {Promise<void>}
    */
   async stop(): Promise<void> {
-    if (this._partitionPump) {
-      await this._partitionPump.stop("Stopped processing");
+    log.eventProcessor(`[${this._id}] Stopping an EventProcessor.`);
+    if (this._abortController) {
+      // cancel the event processor loop
+      this._abortController.abort();
+    }
+
+    this._isRunning = false;
+    try {
+      // waits for the event processor loop to complete
+      // will complete immediately if _loopTask is undefined
+      await this._loopTask;
+    } catch (err) {
+      log.error(`[${this._id}] An error occured while stopping the EventProcessor: ${err}`);
+    } finally {
+      log.eventProcessor(`[${this._id}] EventProcessor stopped.`);
     }
   }
 }
diff --git a/sdk/eventhub/event-hubs/src/index.ts b/sdk/eventhub/event-hubs/src/index.ts
index e00a632b0fd2..bda445efac2f 100644
--- a/sdk/eventhub/event-hubs/src/index.ts
+++ b/sdk/eventhub/event-hubs/src/index.ts
@@ -21,7 +21,16 @@ export { PartitionProperties, EventHubProperties } from "./managementClient";
 export { EventHubProducer } from "./sender";
 export { EventHubConsumer, EventIteratorOptions } from "./receiver";
 export { EventDataBatch } from "./eventDataBatch";
-export { EventProcessor } from "./eventProcessor";
+export { CheckpointManager } from "./checkpointManager";
+export {
+  EventProcessor,
+  CloseReason,
+  EventProcessorOptions,
+  PartitionProcessor,
+  PartitionManager,
+  PartitionProcessorFactory,
+  PartitionOwnership
+} from "./eventProcessor";
 export { PartitionContext } from "./partitionContext";
 export {
   MessagingError,
diff --git a/sdk/eventhub/event-hubs/src/log.ts b/sdk/eventhub/event-hubs/src/log.ts
index 6f8610aeceb0..b4ae70c53b05 100644
--- a/sdk/eventhub/event-hubs/src/log.ts
+++ b/sdk/eventhub/event-hubs/src/log.ts
@@ -58,3 +58,13 @@ export const iotClient = debugModule("azure:event-hubs:iothubClient");
  * log statements for partitionManager
  */
 export const partitionPump = debugModule("azure:event-hubs:partitionPump");
+/**
+ * @ignore
+ * log statements for pumpManager
+ */
+export const pumpManager = debugModule("azure:event-hubs:pumpManager");
+/**
+ * @ignore
+ * log statements for eventProcessor
+ */
+export const eventProcessor = debugModule("azure:event-hubs:eventProcessor");
diff --git a/sdk/eventhub/event-hubs/src/partitionPump.ts b/sdk/eventhub/event-hubs/src/partitionPump.ts
index cd55e47949e6..759875a957a4 100644
--- a/sdk/eventhub/event-hubs/src/partitionPump.ts
+++ b/sdk/eventhub/event-hubs/src/partitionPump.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import * as log from "./log";
-import { EventProcessorOptions, PartitionProcessor } from "./eventProcessor";
+import { EventProcessorOptions, PartitionProcessor, CloseReason } from "./eventProcessor";
 import { PartitionContext } from "./partitionContext";
 import { EventHubClient } from "./eventHubClient";
 import { EventPosition } from "./eventPosition";
@@ -32,16 +32,24 @@ export class PartitionPump {
     this._abortController = new AbortController();
   }
 
-  async start(partitionId: string): Promise<void> {
-    if (this._partitionProcessor.initialize) {
-      await this._partitionProcessor.initialize();
+  public get isReceiving(): boolean {
+    return this._isReceiving;
+  }
+
+  async start(): Promise<void> {
+    this._isReceiving = true;
+    if (typeof this._partitionProcessor.initialize === "function") {
+      try {
+        await this._partitionProcessor.initialize();
+      } catch {
+        // swallow the error from the user-defined code
+      }
     }
-    this._receiveEvents(partitionId);
+    this._receiveEvents(this._partitionContext.partitionId);
     log.partitionPump("Successfully started the receiver.");
   }
 
   private async _receiveEvents(partitionId: string): Promise<void> {
-    this._isReceiving = true;
     try {
       this._receiver = await this._eventHubClient.createConsumer(
         this._partitionContext.consumerGroupName,
@@ -55,6 +63,9 @@ export class PartitionPump {
           this._processorOptions.maxWaitTimeInSeconds,
           this._abortController.signal
         );
+        if (!this._isReceiving) {
+          return;
+        }
         await this._partitionProcessor.processEvents(receivedEvents);
       }
     } catch (err) {
@@ -71,14 +82,14 @@ export class PartitionPump {
     }
   }
 
-  async stop(reason: string): Promise<void> {
+  async stop(reason: CloseReason): Promise<void> {
     this._isReceiving = false;
     try {
       if (this._receiver) {
         await this._receiver.close();
       }
       this._abortController.abort();
-      if (this._partitionProcessor.close) {
+      if (typeof this._partitionProcessor.close === "function") {
         await this._partitionProcessor.close(reason);
       }
     } catch (err) {
diff --git a/sdk/eventhub/event-hubs/src/pumpManager.ts b/sdk/eventhub/event-hubs/src/pumpManager.ts
new file mode 100644
index 000000000000..8b430fa45acc
--- /dev/null
+++ b/sdk/eventhub/event-hubs/src/pumpManager.ts
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { EventHubClient } from "./eventHubClient";
+import { PartitionContext } from "./partitionContext";
+import { EventPosition } from "./eventPosition";
+import { PartitionProcessor, EventProcessorOptions, CloseReason } from "./eventProcessor";
+import { PartitionPump } from "./partitionPump";
+import * as log from "./log";
+
+/**
+ * The PumpManager handles the creation and removal of PartitionPumps.
+ * It also starts a PartitionPump when it is created, and stops a
+ * PartitionPump when it is removed.
+ * @ignore
+ */
+export class PumpManager {
+  private readonly _eventProcessorName: string;
+  private readonly _options: EventProcessorOptions;
+  private _partitionIdToPumps: {
+    [partitionId: string]: PartitionPump | undefined;
+  } = {};
+
+  /**
+   * @ignore
+   */
+  constructor(eventProcessorName: string, eventProcessorOptions: EventProcessorOptions = {}) {
+    this._eventProcessorName = eventProcessorName;
+    this._options = eventProcessorOptions;
+  }
+
+  /**
+   * Returns a list of partitionIds that are actively receiving messages.
+   * @ignore
+   */
+  public receivingFromPartitions(): string[] {
+    return Object.keys(this._partitionIdToPumps).filter((id) => {
+      const pump = this._partitionIdToPumps[id];
+      return Boolean(pump && pump.isReceiving);
+    });
+  }
+
+  /**
+   * Creates and starts a PartitionPump.
+   * @param eventHubClient The EventHubClient to forward to the PartitionPump.
+   * @param partitionContext The PartitionContext to forward to the PartitionPump.
+   * @param initialEventPosition The EventPosition to forward to the PartitionPump.
+   * @param partitionProcessor The PartitionProcessor to forward to the PartitionPump.
+   * @param abortSignal Used to cancel pump creation.
+   * @ignore
+   */
+  public async createPump(
+    eventHubClient: EventHubClient,
+    partitionContext: PartitionContext,
+    initialEventPosition: EventPosition,
+    partitionProcessor: PartitionProcessor
+  ): Promise<void> {
+    const partitionId = partitionContext.partitionId;
+    // attempt to get an existing pump
+    const existingPump = this._partitionIdToPumps[partitionId];
+    if (existingPump) {
+      if (existingPump.isReceiving) {
+        log.pumpManager(
+          `[${this._eventProcessorName}] [${partitionId}] The existing pump is running.`
+        );
+        return;
+      }
+      log.pumpManager(
+        `[${this._eventProcessorName}] [${partitionId}] The existing pump is not running.`
+      );
+      await this.removePump(partitionId, CloseReason.Unknown);
+    }
+
+    log.pumpManager(`[${this._eventProcessorName}] [${partitionId}] Creating a new pump.`);
+
+    const pump = new PartitionPump(eventHubClient, partitionContext, partitionProcessor, {
+      ...this._options,
+      initialEventPosition
+    });
+
+    try {
+      await pump.start();
+      this._partitionIdToPumps[partitionId] = pump;
+    } catch (err) {
+      log.error(
+        `[${this._eventProcessorName}] [${partitionId}] An error occured while adding/updating a pump: ${err}`
+      );
+    }
+  }
+
+  /**
+   * Stop a PartitionPump and removes it from the internal map.
+   * @param partitionId The partitionId to remove the associated PartitionPump from.
+   * @param reason The reason for removing the pump.
+   * @ignore
+   */
+  public async removePump(partitionId: string, reason: CloseReason): Promise<void> {
+    try {
+      const pump = this._partitionIdToPumps[partitionId];
+      if (pump) {
+        delete this._partitionIdToPumps[partitionId];
+        log.pumpManager(`[${this._eventProcessorName}] [${partitionId}] Stopping the pump.`);
+        await pump.stop(reason);
+      } else {
+        log.pumpManager(
+          `[${this._eventProcessorName}] [${partitionId}] No pump was found to remove.`
+        );
+      }
+    } catch (err) {
+      log.error(
+        `[${this._eventProcessorName}] [${partitionId}] An error occured while removing a pump: ${err}`
+      );
+    }
+  }
+
+  /**
+   * Stops all PartitionPumps and removes them from the internal map.
+   * @param reason The reason for removing the pump.
+   * @ignore
+   */
+  public async removeAllPumps(reason: CloseReason): Promise<void> {
+    const partitionIds = Object.keys(this._partitionIdToPumps);
+
+    log.pumpManager(`[${this._eventProcessorName}] Removing all pumps due to reason ${reason}.`);
+
+    const tasks: PromiseLike<void>[] = [];
+    for (const partitionId of partitionIds) {
+      const pump = this._partitionIdToPumps[partitionId];
+      if (pump) {
+        tasks.push(pump.stop(reason));
+      }
+    }
+
+    try {
+      await Promise.all(tasks);
+    } catch (err) {
+      log.error(`[${this._eventProcessorName}] An error occured while removing all pumps: ${err}`);
+    } finally {
+      this._partitionIdToPumps = {};
+    }
+  }
+}
diff --git a/sdk/eventhub/event-hubs/src/util/cancellableDelay.ts b/sdk/eventhub/event-hubs/src/util/cancellableDelay.ts
new file mode 100644
index 000000000000..45a037e9f36a
--- /dev/null
+++ b/sdk/eventhub/event-hubs/src/util/cancellableDelay.ts
@@ -0,0 +1,17 @@
+import { AbortSignalLike, AbortError } from "@azure/abort-controller";
+
+export function cancellableDelay(delayInMs: number, abortSignal?: AbortSignalLike): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (abortSignal && abortSignal.aborted) {
+      return reject(new AbortError(`The delay was cancelled by the user.`));
+    }
+
+    const timer = setTimeout(resolve, delayInMs);
+    if (abortSignal) {
+      abortSignal.addEventListener("abort", () => {
+        clearTimeout(timer);
+        reject(new AbortError(`The delay was cancelled by the user.`));
+      });
+    }
+  });
+}
diff --git a/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts b/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts
index 2fdb84605c45..abb870103b43 100644
--- a/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts
+++ b/sdk/eventhub/event-hubs/test/eventProcessor.spec.ts
@@ -13,7 +13,9 @@ import {
   EventData,
   EventProcessor,
   PartitionContext,
-  delay
+  delay,
+  PartitionProcessorFactory,
+  CloseReason
 } from "../src";
 import { EnvVarKeys, getEnvVars } from "./utils/testUtils";
 const env = getEnvVars();
@@ -39,7 +41,340 @@ describe("Event Processor", function(): void {
     await client.close();
   });
 
+  it("should treat consecutive start invocations as idempotent", async function(): Promise<void> {
+    const partitionIds = await client.getPartitionIds();
+
+    // ensure we have at least 2 partitions
+    partitionIds.length.should.gte(2);
+
+    const partitionResultsMap = new Map<
+      string,
+      { events: string[]; initialized: boolean; closeReason?: CloseReason }
+    >();
+    partitionIds.forEach((id) => partitionResultsMap.set(id, { events: [], initialized: false }));
+    let didError = false;
+
+    // The partitionProcess will need to add events to the partitionResultsMap as they are received
+    const factory: PartitionProcessorFactory = (context) => {
+      return {
+        async initialize() {
+          partitionResultsMap.get(context.partitionId)!.initialized = true;
+        },
+        async close(reason) {
+          partitionResultsMap.get(context.partitionId)!.closeReason = reason;
+        },
+        async processEvents(events) {
+          const existingEvents = partitionResultsMap.get(context.partitionId)!.events;
+          events.forEach((event) => existingEvents.push(event.body));
+        },
+        async processError() {
+          didError = true;
+        }
+      };
+    };
+
+    const processor = new EventProcessor(
+      EventHubClient.defaultConsumerGroupName,
+      client,
+      factory,
+      undefined as any,
+      {
+        initialEventPosition: EventPosition.fromEnqueuedTime(new Date())
+      }
+    );
+
+    processor.start();
+    processor.start();
+    processor.start();
+
+    // create messages
+    const expectedMessagePrefix = "EventProcessor test - multiple partitions - ";
+    for (const partitionId of partitionIds) {
+      const producer = client.createProducer({ partitionId });
+      await producer.send({ body: expectedMessagePrefix + partitionId });
+      await producer.close();
+    }
+
+    // shutdown the processor
+    await processor.stop();
+
+    didError.should.be.false;
+    // validate correct events captured for each partition
+    for (const partitionId of partitionIds) {
+      const results = partitionResultsMap.get(partitionId)!;
+      const events = results.events;
+      events.length.should.equal(1);
+      events[0].should.equal(expectedMessagePrefix + partitionId);
+      results.initialized.should.be.true;
+      (results.closeReason === CloseReason.Shutdown).should.be.true;
+    }
+  });
+
+  it("should not throw if stop is called without start", async function(): Promise<void> {
+    let didPartitionProcessorStart = false;
+
+    // The partitionProcess will need to add events to the partitionResultsMap as they are received
+    const factory: PartitionProcessorFactory = (context) => {
+      return {
+        async initialize() {
+          didPartitionProcessorStart = true;
+        },
+        async close() {
+          didPartitionProcessorStart = true;
+        },
+        async processEvents(events) {
+          didPartitionProcessorStart = true;
+        },
+        async processError() {
+          didPartitionProcessorStart = true;
+        }
+      };
+    };
+
+    const processor = new EventProcessor(
+      EventHubClient.defaultConsumerGroupName,
+      client,
+      factory,
+      undefined as any,
+      {
+        initialEventPosition: EventPosition.fromEnqueuedTime(new Date())
+      }
+    );
+
+    // shutdown the processor
+    await processor.stop();
+
+    didPartitionProcessorStart.should.be.false;
+  });
+
+  it("should support start after stopping", async function(): Promise<void> {
+    const partitionIds = await client.getPartitionIds();
+
+    // ensure we have at least 2 partitions
+    partitionIds.length.should.gte(2);
+
+    const partitionResultsMap = new Map<
+      string,
+      { events: string[]; initialized: boolean; closeReason?: CloseReason }
+    >();
+    partitionIds.forEach((id) => partitionResultsMap.set(id, { events: [], initialized: false }));
+    let didError = false;
+
+    // The partitionProcess will need to add events to the partitionResultsMap as they are received
+    const factory: PartitionProcessorFactory = (context) => {
+      return {
+        async initialize() {
+          partitionResultsMap.get(context.partitionId)!.initialized = true;
+        },
+        async close(reason) {
+          partitionResultsMap.get(context.partitionId)!.closeReason = reason;
+        },
+        async processEvents(events) {
+          const existingEvents = partitionResultsMap.get(context.partitionId)!.events;
+          events.forEach((event) => existingEvents.push(event.body));
+        },
+        async processError() {
+          didError = true;
+        }
+      };
+    };
+
+    const processor = new EventProcessor(
+      EventHubClient.defaultConsumerGroupName,
+      client,
+      factory,
+      undefined as any,
+      {
+        initialEventPosition: EventPosition.fromEnqueuedTime(new Date())
+      }
+    );
+
+    processor.start();
+
+    // create messages
+    const expectedMessagePrefix = "EventProcessor test - multiple partitions - ";
+    for (const partitionId of partitionIds) {
+      const producer = client.createProducer({ partitionId });
+      await producer.send({ body: expectedMessagePrefix + partitionId });
+      await producer.close();
+    }
+
+    // set a delay to give a consumers a chance to receive a message
+    await delay(1000);
+
+    // shutdown the processor
+    await processor.stop();
+
+    didError.should.be.false;
+    // validate correct events captured for each partition
+    for (const partitionId of partitionIds) {
+      const results = partitionResultsMap.get(partitionId)!;
+      const events = results.events;
+      events.length.should.equal(1);
+      events[0].should.equal(expectedMessagePrefix + partitionId);
+      results.initialized.should.be.true;
+      (results.closeReason === CloseReason.Shutdown).should.be.true;
+      // reset fields
+      results.initialized = false;
+      results.closeReason = undefined;
+      results.events = [];
+    }
+
+    // start it again
+    // note: since checkpointing isn't implemented yet,
+    // EventProcessor will retrieve events from the initialEventPosition.
+    processor.start();
+
+    // set a delay to give a consumers a chance to receive a message
+    await delay(1000);
+
+    await processor.stop();
+
+    didError.should.be.false;
+    // validate correct events captured for each partition
+    for (const partitionId of partitionIds) {
+      const results = partitionResultsMap.get(partitionId)!;
+      const events = results.events;
+      events.length.should.equal(1);
+      events[0].should.equal(expectedMessagePrefix + partitionId);
+      results.initialized.should.be.true;
+      (results.closeReason === CloseReason.Shutdown).should.be.true;
+    }
+  });
+
   describe("Partition processor", function(): void {
+    it("should support processing events across multiple partitions", async function(): Promise<
+      void
+    > {
+      const partitionIds = await client.getPartitionIds();
+
+      // ensure we have at least 2 partitions
+      partitionIds.length.should.gte(2);
+
+      const partitionResultsMap = new Map<
+        string,
+        { events: string[]; initialized: boolean; closeReason?: CloseReason }
+      >();
+      partitionIds.forEach((id) => partitionResultsMap.set(id, { events: [], initialized: false }));
+      let didError = false;
+
+      // The partitionProcess will need to add events to the partitionResultsMap as they are received
+      const factory: PartitionProcessorFactory = (context) => {
+        return {
+          async initialize() {
+            partitionResultsMap.get(context.partitionId)!.initialized = true;
+          },
+          async close(reason) {
+            partitionResultsMap.get(context.partitionId)!.closeReason = reason;
+          },
+          async processEvents(events) {
+            const existingEvents = partitionResultsMap.get(context.partitionId)!.events;
+            events.forEach((event) => existingEvents.push(event.body));
+          },
+          async processError() {
+            didError = true;
+          }
+        };
+      };
+
+      const processor = new EventProcessor(
+        EventHubClient.defaultConsumerGroupName,
+        client,
+        factory,
+        undefined as any,
+        {
+          initialEventPosition: EventPosition.fromEnqueuedTime(new Date())
+        }
+      );
+
+      processor.start();
+
+      // create messages
+      const expectedMessagePrefix = "EventProcessor test - multiple partitions - ";
+      for (const partitionId of partitionIds) {
+        const producer = client.createProducer({ partitionId });
+        await producer.send({ body: expectedMessagePrefix + partitionId });
+        await producer.close();
+      }
+
+      // set a delay to give a consumers a chance to receive a message
+      await delay(1000);
+
+      // shutdown the processor
+      await processor.stop();
+
+      didError.should.be.false;
+      // validate correct events captured for each partition
+      for (const partitionId of partitionIds) {
+        const results = partitionResultsMap.get(partitionId)!;
+        const events = results.events;
+        events.length.should.equal(1);
+        events[0].should.equal(expectedMessagePrefix + partitionId);
+        results.initialized.should.be.true;
+        (results.closeReason === CloseReason.Shutdown).should.be.true;
+      }
+    });
+
+    it("should support processing events across multiple partitions without initialize or close", async function(): Promise<
+      void
+    > {
+      const partitionIds = await client.getPartitionIds();
+
+      // ensure we have at least 2 partitions
+      partitionIds.length.should.gte(2);
+
+      const partitionResultsMap = new Map<string, string[]>();
+      partitionIds.forEach((id) => partitionResultsMap.set(id, []));
+      let didError = false;
+
+      // The partitionProcess will need to add events to the partitionResultsMap as they are received
+      const factory: PartitionProcessorFactory = (context) => {
+        return {
+          async processEvents(events) {
+            const existingEvents = partitionResultsMap.get(context.partitionId)!;
+            events.forEach((event) => existingEvents.push(event.body));
+          },
+          async processError() {
+            didError = true;
+          }
+        };
+      };
+
+      const processor = new EventProcessor(
+        EventHubClient.defaultConsumerGroupName,
+        client,
+        factory,
+        undefined as any,
+        {
+          initialEventPosition: EventPosition.fromEnqueuedTime(new Date())
+        }
+      );
+
+      processor.start();
+
+      // create messages
+      const expectedMessagePrefix = "EventProcessor test - multiple partitions - ";
+      for (const partitionId of partitionIds) {
+        const producer = client.createProducer({ partitionId });
+        await producer.send({ body: expectedMessagePrefix + partitionId });
+        await producer.close();
+      }
+
+      // set a delay to give a consumers a chance to receive a message
+      await delay(1000);
+
+      // shutdown the processor
+      await processor.stop();
+
+      didError.should.be.false;
+      // validate correct events captured for each partition
+      for (const partitionId of partitionIds) {
+        const events = partitionResultsMap.get(partitionId)!;
+        events.length.should.equal(1);
+        events[0].should.equal(expectedMessagePrefix + partitionId);
+      }
+    });
+
     it("should call methods on a PartitionProcessor ", async function(): Promise<void> {
       const receivedEvents: EventData[] = [];
       let isinitializeCalled = false;

From f2c47b74f070088f6c7780f6838dd8f812d8e88f Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:02:57 +0000
Subject: [PATCH 23/24] Generated from 1f1421f9fdbf67ac8c1ac7f540346d3e98eef77e
 (#4431)

remove x-ms-odata
---
 sdk/apimanagement/arm-apimanagement/README.md |  10 +-
 .../arm-apimanagement/package.json            |  10 +-
 .../arm-apimanagement/rollup.config.js        |   8 +-
 .../src/apiManagementClient.ts                |   4 +-
 .../src/apiManagementClientContext.ts         |  12 +-
 .../arm-apimanagement/src/models/index.ts     | 810 ++++++++++--------
 .../arm-apimanagement/src/models/mappers.ts   | 588 ++++++-------
 .../src/models/parameters.ts                  | 144 ++--
 .../arm-apimanagement/src/operations/api.ts   |  92 +-
 .../src/operations/apiDiagnostic.ts           |  74 +-
 .../src/operations/apiExport.ts               |  14 +-
 .../src/operations/apiIssue.ts                |  72 +-
 .../src/operations/apiIssueAttachment.ts      |  62 +-
 .../src/operations/apiIssueComment.ts         |  62 +-
 .../src/operations/apiManagementOperations.ts |  24 +-
 .../src/operations/apiManagementService.ts    | 122 +--
 .../operations/apiManagementServiceSkus.ts    |  24 +-
 .../src/operations/apiOperation.ts            |  74 +-
 .../src/operations/apiOperationPolicy.ts      |  52 +-
 .../src/operations/apiPolicy.ts               |  52 +-
 .../src/operations/apiProduct.ts              |  22 +-
 .../src/operations/apiRelease.ts              |  74 +-
 .../src/operations/apiRevision.ts             |  22 +-
 .../src/operations/apiSchema.ts               |  62 +-
 .../src/operations/apiTagDescription.ts       |  62 +-
 .../src/operations/apiVersionSet.ts           |  74 +-
 .../src/operations/authorizationServer.ts     |  74 +-
 .../src/operations/backend.ts                 |  86 +-
 .../arm-apimanagement/src/operations/cache.ts |  74 +-
 .../src/operations/certificate.ts             |  62 +-
 .../src/operations/delegationSettings.ts      |  44 +-
 .../src/operations/diagnostic.ts              |  74 +-
 .../src/operations/emailTemplate.ts           |  74 +-
 .../arm-apimanagement/src/operations/group.ts |  74 +-
 .../src/operations/groupUser.ts               |  54 +-
 .../src/operations/identityProvider.ts        |  76 +-
 .../arm-apimanagement/src/operations/issue.ts |  32 +-
 .../src/operations/logger.ts                  |  74 +-
 .../src/operations/networkStatus.ts           |  24 +-
 .../src/operations/notification.ts            |  40 +-
 .../operations/notificationRecipientEmail.ts  |  46 +-
 .../operations/notificationRecipientUser.ts   |  46 +-
 .../src/operations/openIdConnectProvider.ts   |  74 +-
 .../src/operations/operationOperations.ts     |  22 +-
 .../src/operations/policy.ts                  |  52 +-
 .../src/operations/policySnippet.ts           |  12 +-
 .../src/operations/product.ts                 |  92 +-
 .../src/operations/productApi.ts              |  56 +-
 .../src/operations/productGroup.ts            |  56 +-
 .../src/operations/productPolicy.ts           |  52 +-
 .../src/operations/productSubscriptions.ts    |  22 +-
 .../src/operations/property.ts                |  74 +-
 .../src/operations/quotaByCounterKeys.ts      |  26 +-
 .../src/operations/quotaByPeriodKeys.ts       |  26 +-
 .../src/operations/region.ts                  |  24 +-
 .../src/operations/reports.ts                 | 138 +--
 .../src/operations/signInSettings.ts          |  44 +-
 .../src/operations/signUpSettings.ts          |  44 +-
 .../src/operations/subscription.ts            |  98 +--
 .../arm-apimanagement/src/operations/tag.ts   | 254 +++---
 .../src/operations/tagResource.ts             |  22 +-
 .../src/operations/tenantAccess.ts            |  60 +-
 .../src/operations/tenantAccessGit.ts         |  38 +-
 .../src/operations/tenantConfiguration.ts     |  40 +-
 .../arm-apimanagement/src/operations/user.ts  |  94 +-
 .../operations/userConfirmationPassword.ts    |  16 +-
 .../src/operations/userGroup.ts               |  22 +-
 .../src/operations/userIdentities.ts          |  24 +-
 .../src/operations/userSubscription.ts        |  22 +-
 69 files changed, 2567 insertions(+), 2517 deletions(-)

diff --git a/sdk/apimanagement/arm-apimanagement/README.md b/sdk/apimanagement/arm-apimanagement/README.md
index 862f3d10a47b..7abcc247b997 100644
--- a/sdk/apimanagement/arm-apimanagement/README.md
+++ b/sdk/apimanagement/arm-apimanagement/README.md
@@ -26,8 +26,8 @@ npm install @azure/ms-rest-nodeauth
 ##### Sample code
 
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
 import { ApiManagementClient, ApiManagementModels, ApiManagementMappers } from "@azure/arm-apimanagement";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
@@ -68,8 +68,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 <html lang="en">
   <head>
     <title>@azure/arm-apimanagement sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/@azure/core-http/dist/coreHttp.browser.js"></script>
+    <script src="node_modules/@azure/core-arm/dist/coreArm.js"></script>
     <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/arm-apimanagement/dist/arm-apimanagement.js"></script>
     <script type="text/javascript">
@@ -108,3 +108,5 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 ## Related projects
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/apimanagement/arm-apimanagement/README.png)
diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index 3dc6a1e94b14..b3a26bfc5de1 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -4,8 +4,8 @@
   "description": "ApiManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.8.1",
+    "@azure/core-arm": "^1.0.0-preview.1",
+    "@azure/core-http": "^1.0.0-preview.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -26,13 +26,13 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/apimanagement/arm-apimanagement",
   "repository": {
     "type": "git",
-    "url": "https://github.com/azure/azure-sdk-for-js.git"
+    "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
   "bugs": {
-    "url": "https://github.com/azure/azure-sdk-for-js/issues"
+    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
   },
   "files": [
     "dist/**/*.js",
diff --git a/sdk/apimanagement/arm-apimanagement/rollup.config.js b/sdk/apimanagement/arm-apimanagement/rollup.config.js
index dc0dc5622703..90edb8e8a3ff 100644
--- a/sdk/apimanagement/arm-apimanagement/rollup.config.js
+++ b/sdk/apimanagement/arm-apimanagement/rollup.config.js
@@ -8,8 +8,8 @@ import sourcemaps from "rollup-plugin-sourcemaps";
 const config = {
   input: "./esm/apiManagementClient.js",
   external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
+    "@azure/core-http",
+    "@azure/core-arm"
   ],
   output: {
     file: "./dist/arm-apimanagement.js",
@@ -17,8 +17,8 @@ const config = {
     name: "Azure.ArmApimanagement",
     sourcemap: true,
     globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
+      "@azure/core-http": "coreHttp",
+      "@azure/core-arm": "coreArm"
     },
     banner: `/*
  * Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
index 454cda6b424c..3a64af8ce303 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
@@ -86,7 +86,7 @@ class ApiManagementClient extends ApiManagementClientContext {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     super(credentials, subscriptionId, options);
     this.api = new operations.Api(this);
     this.apiRevision = new operations.ApiRevision(this);
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index 0a2d57d4bcfe..220b849ff8d9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -9,14 +9,14 @@
  */
 
 import * as Models from "./models";
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 
 const packageName = "@azure/arm-apimanagement";
 const packageVersion = "5.1.0";
 
-export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
-  credentials: msRest.ServiceClientCredentials;
+export class ApiManagementClientContext extends coreArm.AzureServiceClient {
+  credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials;
   apiVersion?: string;
   subscriptionId: string;
 
@@ -27,7 +27,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
    * subscription. The subscription ID forms part of the URI for every service call.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
+  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, subscriptionId: string, options?: Models.ApiManagementClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
@@ -39,7 +39,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
       options = {};
     }
     if(!options.userAgent) {
-      const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
+      const defaultUserAgent = coreArm.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index f91afeb3611d..27473a3b8b3e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -6,8 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export { BaseResource, CloudError };
 
@@ -2355,13 +2355,31 @@ export interface ApiManagementServiceBaseProperties {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2505,13 +2523,31 @@ export interface ApiManagementServiceResource extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -2639,13 +2675,31 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
    */
   additionalLocations?: AdditionalLocation[];
   /**
-   * Custom properties of the API Management service. Setting
+   * Custom properties of the API Management service.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the
-   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting
+   * cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable
-   * just TLS 1.1 and setting
+   * just TLS 1.1.</br>Setting
    * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable
-   * TLS 1.0 on an API Management service.
+   * TLS 1.0 on an API Management service.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to
+   * disable just TLS 1.1 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to
+   * disable TLS 1.0 for communications with backends.</br>Setting
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable
+   * HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on
+   * PATCH operation will reset omitted properties' values to their defaults. For all the settings
+   * except Http2 the default value is `True` if the service was created on or before April 1st
+   * 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable
+   * any of next ciphers by using settings
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
+   * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+   * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+   * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
+   * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA.
+   * For example,
+   * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
+   * The default value is `true` for them.
    */
   customProperties?: { [propertyName: string]: string };
   /**
@@ -4407,7 +4461,7 @@ export interface QuotaCounterValueContract {
 /**
  * Optional Parameters.
  */
-export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4440,7 +4494,7 @@ export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4451,7 +4505,7 @@ export interface ApiCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete all revisions of the Api.
    */
@@ -4461,7 +4515,7 @@ export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase
 /**
  * Optional Parameters.
  */
-export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * | Field       | Supported operators    | Supported functions               |
    * |-------------|------------------------|-----------------------------------|
@@ -4492,7 +4546,7 @@ export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiBeginCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4503,7 +4557,7 @@ export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiRevisionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter |
@@ -4523,7 +4577,7 @@ export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le,
@@ -4543,7 +4597,7 @@ export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiReleaseCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4554,7 +4608,7 @@ export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4583,7 +4637,7 @@ export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4594,7 +4648,7 @@ export interface ApiOperationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4604,7 +4658,7 @@ export interface ApiOperationPolicyGetOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4615,7 +4669,7 @@ export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface TagListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4636,7 +4690,7 @@ export interface TagListByOperationOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4657,7 +4711,7 @@ export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface TagListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4678,7 +4732,7 @@ export interface TagListByProductOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4703,7 +4757,7 @@ export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface TagCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4714,7 +4768,7 @@ export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ApiProductListByApisOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiProductListByApisOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4734,7 +4788,7 @@ export interface ApiProductListByApisOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -4744,7 +4798,7 @@ export interface ApiPolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4755,7 +4809,7 @@ export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter |
@@ -4775,7 +4829,7 @@ export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4786,7 +4840,7 @@ export interface ApiSchemaCreateOrUpdateOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiSchemaDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * If true removes all references to the schema before deleting it.
    */
@@ -4796,7 +4850,7 @@ export interface ApiSchemaDeleteMethodOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4816,7 +4870,7 @@ export interface ApiDiagnosticListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiDiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4827,7 +4881,7 @@ export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4853,7 +4907,7 @@ export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Expand the comment attachments.
    */
@@ -4863,7 +4917,7 @@ export interface ApiIssueGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4874,7 +4928,7 @@ export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4895,7 +4949,7 @@ export interface ApiIssueCommentListByServiceOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueCommentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4906,7 +4960,7 @@ export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.Requ
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -4927,7 +4981,7 @@ export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4938,7 +4992,7 @@ export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
@@ -4959,7 +5013,7 @@ export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -4970,7 +5024,7 @@ export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.Re
 /**
  * Optional Parameters.
  */
-export interface OperationListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface OperationListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5000,7 +5054,7 @@ export interface OperationListByTagsOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>
@@ -5019,7 +5073,7 @@ export interface ApiVersionSetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiVersionSetCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5030,7 +5084,7 @@ export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5051,7 +5105,7 @@ export interface AuthorizationServerListByServiceOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface AuthorizationServerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5062,7 +5116,7 @@ export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.
 /**
  * Optional Parameters.
  */
-export interface BackendListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5084,7 +5138,7 @@ export interface BackendListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5095,7 +5149,7 @@ export interface BackendCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBase {
+export interface BackendReconnectOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Reconnect request parameters.
    */
@@ -5105,7 +5159,7 @@ export interface BackendReconnectOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5119,7 +5173,7 @@ export interface CacheListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CacheCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5130,7 +5184,7 @@ export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface CertificateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5153,7 +5207,7 @@ export interface CertificateListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface CertificateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5164,7 +5218,7 @@ export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5176,7 +5230,7 @@ export interface ApiManagementServiceApplyNetworkConfigurationUpdatesOptionalPar
 /**
  * Optional Parameters.
  */
-export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends msRest.RequestOptionsBase {
+export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Parameters supplied to the Apply Network Configuration operation. If the parameters are empty,
    * all the regions in which the Api Management service is deployed will be updated sequentially
@@ -5188,7 +5242,7 @@ export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOption
 /**
  * Optional Parameters.
  */
-export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5208,7 +5262,7 @@ export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DiagnosticCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5219,7 +5273,7 @@ export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5239,7 +5293,7 @@ export interface EmailTemplateListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface EmailTemplateCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5250,7 +5304,7 @@ export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5273,7 +5327,7 @@ export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5284,7 +5338,7 @@ export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
+export interface GroupUserListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5309,7 +5363,7 @@ export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface IdentityProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5320,7 +5374,7 @@ export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.Req
 /**
  * Optional Parameters.
  */
-export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface IssueListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5345,7 +5399,7 @@ export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface LoggerListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5368,7 +5422,7 @@ export interface LoggerListByServiceOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5379,7 +5433,7 @@ export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface LoggerDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Force deletion even if diagnostic is attached.
    */
@@ -5389,7 +5443,7 @@ export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface NotificationListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5403,7 +5457,7 @@ export interface NotificationListByServiceOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface NotificationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface NotificationCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5414,7 +5468,7 @@ export interface NotificationCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5435,7 +5489,7 @@ export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest
 /**
  * Optional Parameters.
  */
-export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5446,7 +5500,7 @@ export interface OpenIdConnectProviderCreateOrUpdateOptionalParams extends msRes
 /**
  * Optional Parameters.
  */
-export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5456,7 +5510,7 @@ export interface PolicyGetOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5467,7 +5521,7 @@ export interface PolicyCreateOrUpdateOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface PolicySnippetListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PolicySnippetListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy scope. Possible values include: 'Tenant', 'Product', 'Api', 'Operation', 'All'
    */
@@ -5477,7 +5531,7 @@ export interface PolicySnippetListByServiceOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignInSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5488,7 +5542,7 @@ export interface SignInSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SignUpSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5499,7 +5553,7 @@ export interface SignUpSettingsCreateOrUpdateOptionalParams extends msRest.Reque
 /**
  * Optional Parameters.
  */
-export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface DelegationSettingsCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5510,7 +5564,7 @@ export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.R
 /**
  * Optional Parameters.
  */
-export interface ProductListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5543,7 +5597,7 @@ export interface ProductListByServiceOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5554,7 +5608,7 @@ export interface ProductCreateOrUpdateOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Delete existing subscriptions associated with the product or not.
    */
@@ -5564,7 +5618,7 @@ export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptions
 /**
  * Optional Parameters.
  */
-export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductListByTagsOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5592,7 +5646,7 @@ export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ProductApiListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductApiListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5617,7 +5671,7 @@ export interface ProductApiListByProductOptionalParams extends msRest.RequestOpt
 /**
  * Optional Parameters.
  */
-export interface ProductGroupListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductGroupListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5638,7 +5692,7 @@ export interface ProductGroupListByProductOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductSubscriptionsListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5665,7 +5719,7 @@ export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyGetOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Policy Export Format. Possible values include: 'xml', 'rawxml'. Default value: 'xml'.
    */
@@ -5675,7 +5729,7 @@ export interface ProductPolicyGetOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface ProductPolicyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5686,7 +5740,7 @@ export interface ProductPolicyCreateOrUpdateOptionalParams extends msRest.Reques
 /**
  * Optional Parameters.
  */
-export interface PropertyListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le,
@@ -5707,7 +5761,7 @@ export interface PropertyListByServiceOptionalParams extends msRest.RequestOptio
 /**
  * Optional Parameters.
  */
-export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface PropertyCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5718,7 +5772,7 @@ export interface PropertyCreateOrUpdateOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByApiOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5736,7 +5790,7 @@ export interface ReportsListByApiOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByUserOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5754,7 +5808,7 @@ export interface ReportsListByUserOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByOperationOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByOperationOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5772,7 +5826,7 @@ export interface ReportsListByOperationOptionalParams extends msRest.RequestOpti
 /**
  * Optional Parameters.
  */
-export interface ReportsListByProductOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByProductOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5790,7 +5844,7 @@ export interface ReportsListByProductOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByGeoOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5804,7 +5858,7 @@ export interface ReportsListByGeoOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListBySubscriptionOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5822,7 +5876,7 @@ export interface ReportsListBySubscriptionOptionalParams extends msRest.RequestO
 /**
  * Optional Parameters.
  */
-export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByTimeOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5840,7 +5894,7 @@ export interface ReportsListByTimeOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface ReportsListByRequestOptionalParams extends msRest.RequestOptionsBase {
+export interface ReportsListByRequestOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Number of records to return.
    */
@@ -5854,7 +5908,7 @@ export interface ReportsListByRequestOptionalParams extends msRest.RequestOption
 /**
  * Optional Parameters.
  */
-export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5881,7 +5935,7 @@ export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5898,7 +5952,7 @@ export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.Request
 /**
  * Optional Parameters.
  */
-export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface SubscriptionUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Notify change in Subscription State.
    * - If false, do not send any email notification for change of state of subscription
@@ -5910,7 +5964,7 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface TagResourceListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface TagResourceListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le,
@@ -5942,7 +5996,7 @@ export interface TagResourceListByServiceOptionalParams extends msRest.RequestOp
 /**
  * Optional Parameters.
  */
-export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBase {
+export interface UserListByServiceOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -5972,7 +6026,7 @@ export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBa
 /**
  * Optional Parameters.
  */
-export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+export interface UserCreateOrUpdateOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -5983,7 +6037,7 @@ export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsB
 /**
  * Optional Parameters.
  */
-export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
+export interface UserDeleteMethodOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * Whether to delete user's subscription or not.
    */
@@ -5997,7 +6051,7 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
 /**
  * Optional Parameters.
  */
-export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserGroupListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -6019,7 +6073,7 @@ export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
 /**
  * Optional Parameters.
  */
-export interface UserSubscriptionListOptionalParams extends msRest.RequestOptionsBase {
+export interface UserSubscriptionListOptionalParams extends coreHttp.RequestOptionsBase {
   /**
    * |   Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
@@ -7943,7 +7997,7 @@ export type ApiListByServiceResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -7963,7 +8017,7 @@ export type ApiGetEntityTagResponse = ApiGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -7978,7 +8032,7 @@ export type ApiGetResponse = ApiContract & ApiGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8003,7 +8057,7 @@ export type ApiCreateOrUpdateResponse = ApiContract & ApiCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8028,7 +8082,7 @@ export type ApiListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8048,7 +8102,7 @@ export type ApiListByServiceNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8068,7 +8122,7 @@ export type ApiListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8088,7 +8142,7 @@ export type ApiRevisionListByServiceResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8108,7 +8162,7 @@ export type ApiRevisionListByServiceNextResponse = ApiRevisionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8128,7 +8182,7 @@ export type ApiReleaseListByServiceResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8148,7 +8202,7 @@ export type ApiReleaseGetEntityTagResponse = ApiReleaseGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8163,7 +8217,7 @@ export type ApiReleaseGetResponse = ApiReleaseContract & ApiReleaseGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8188,7 +8242,7 @@ export type ApiReleaseCreateOrUpdateResponse = ApiReleaseContract & ApiReleaseCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8213,7 +8267,7 @@ export type ApiReleaseListByServiceNextResponse = ApiReleaseCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8233,7 +8287,7 @@ export type ApiOperationListByApiResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8253,7 +8307,7 @@ export type ApiOperationGetEntityTagResponse = ApiOperationGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8268,7 +8322,7 @@ export type ApiOperationGetResponse = OperationContract & ApiOperationGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8293,7 +8347,7 @@ export type ApiOperationCreateOrUpdateResponse = OperationContract & ApiOperatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8318,7 +8372,7 @@ export type ApiOperationListByApiNextResponse = OperationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8338,7 +8392,7 @@ export type ApiOperationPolicyListByOperationResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8358,7 +8412,7 @@ export type ApiOperationPolicyGetEntityTagResponse = ApiOperationPolicyGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8373,7 +8427,7 @@ export type ApiOperationPolicyGetResponse = PolicyContract & ApiOperationPolicyG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8398,7 +8452,7 @@ export type ApiOperationPolicyCreateOrUpdateResponse = PolicyContract & ApiOpera
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8423,7 +8477,7 @@ export type TagListByOperationResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8443,7 +8497,7 @@ export type TagGetEntityStateByOperationResponse = TagGetEntityStateByOperationH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8458,7 +8512,7 @@ export type TagGetByOperationResponse = TagContract & TagGetByOperationHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8483,7 +8537,7 @@ export type TagAssignToOperationResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8503,7 +8557,7 @@ export type TagListByApiResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8523,7 +8577,7 @@ export type TagGetEntityStateByApiResponse = TagGetEntityStateByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8538,7 +8592,7 @@ export type TagGetByApiResponse = TagContract & TagGetByApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8563,7 +8617,7 @@ export type TagAssignToApiResponse = TagContract & TagAssignToApiHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8588,7 +8642,7 @@ export type TagListByProductResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8608,7 +8662,7 @@ export type TagGetEntityStateByProductResponse = TagGetEntityStateByProductHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8623,7 +8677,7 @@ export type TagGetByProductResponse = TagContract & TagGetByProductHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8648,7 +8702,7 @@ export type TagAssignToProductResponse = TagContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8668,7 +8722,7 @@ export type TagListByServiceResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8688,7 +8742,7 @@ export type TagGetEntityStateResponse = TagGetEntityStateHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8703,7 +8757,7 @@ export type TagGetResponse = TagContract & TagGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8728,7 +8782,7 @@ export type TagCreateOrUpdateResponse = TagContract & TagCreateOrUpdateHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8753,7 +8807,7 @@ export type TagListByOperationNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8773,7 +8827,7 @@ export type TagListByApiNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8793,7 +8847,7 @@ export type TagListByProductNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8813,7 +8867,7 @@ export type TagListByServiceNextResponse = TagCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8833,7 +8887,7 @@ export type ApiProductListByApisResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8853,7 +8907,7 @@ export type ApiProductListByApisNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8873,7 +8927,7 @@ export type ApiPolicyListByApiResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8893,7 +8947,7 @@ export type ApiPolicyGetEntityTagResponse = ApiPolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8908,7 +8962,7 @@ export type ApiPolicyGetResponse = PolicyContract & ApiPolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8933,7 +8987,7 @@ export type ApiPolicyCreateOrUpdateResponse = PolicyContract & ApiPolicyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8958,7 +9012,7 @@ export type ApiSchemaListByApiResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -8978,7 +9032,7 @@ export type ApiSchemaGetEntityTagResponse = ApiSchemaGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -8993,7 +9047,7 @@ export type ApiSchemaGetResponse = SchemaContract & ApiSchemaGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9018,7 +9072,7 @@ export type ApiSchemaCreateOrUpdateResponse = SchemaContract & ApiSchemaCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9043,7 +9097,7 @@ export type ApiSchemaListByApiNextResponse = SchemaCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9063,7 +9117,7 @@ export type ApiDiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9083,7 +9137,7 @@ export type ApiDiagnosticGetEntityTagResponse = ApiDiagnosticGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9098,7 +9152,7 @@ export type ApiDiagnosticGetResponse = DiagnosticContract & ApiDiagnosticGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9123,7 +9177,7 @@ export type ApiDiagnosticCreateOrUpdateResponse = DiagnosticContract & ApiDiagno
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9148,7 +9202,7 @@ export type ApiDiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9168,7 +9222,7 @@ export type ApiIssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9188,7 +9242,7 @@ export type ApiIssueGetEntityTagResponse = ApiIssueGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9203,7 +9257,7 @@ export type ApiIssueGetResponse = IssueContract & ApiIssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9228,7 +9282,7 @@ export type ApiIssueCreateOrUpdateResponse = IssueContract & ApiIssueCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9253,7 +9307,7 @@ export type ApiIssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9273,7 +9327,7 @@ export type ApiIssueCommentListByServiceResponse = IssueCommentCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9293,7 +9347,7 @@ export type ApiIssueCommentGetEntityTagResponse = ApiIssueCommentGetEntityTagHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9308,7 +9362,7 @@ export type ApiIssueCommentGetResponse = IssueCommentContract & ApiIssueCommentG
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9333,7 +9387,7 @@ export type ApiIssueCommentCreateOrUpdateResponse = IssueCommentContract & ApiIs
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9358,7 +9412,7 @@ export type ApiIssueCommentListByServiceNextResponse = IssueCommentCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9378,7 +9432,7 @@ export type ApiIssueAttachmentListByServiceResponse = IssueAttachmentCollection
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9398,7 +9452,7 @@ export type ApiIssueAttachmentGetEntityTagResponse = ApiIssueAttachmentGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9413,7 +9467,7 @@ export type ApiIssueAttachmentGetResponse = IssueAttachmentContract & ApiIssueAt
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9438,7 +9492,7 @@ export type ApiIssueAttachmentCreateOrUpdateResponse = IssueAttachmentContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9463,7 +9517,7 @@ export type ApiIssueAttachmentListByServiceNextResponse = IssueAttachmentCollect
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9483,7 +9537,7 @@ export type ApiTagDescriptionListByServiceResponse = TagDescriptionCollection &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9503,7 +9557,7 @@ export type ApiTagDescriptionGetEntityTagResponse = ApiTagDescriptionGetEntityTa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9518,7 +9572,7 @@ export type ApiTagDescriptionGetResponse = TagDescriptionContract & ApiTagDescri
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9543,7 +9597,7 @@ export type ApiTagDescriptionCreateOrUpdateResponse = TagDescriptionContract & A
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9568,7 +9622,7 @@ export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollectio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9588,7 +9642,7 @@ export type OperationListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9608,7 +9662,7 @@ export type OperationListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9628,7 +9682,7 @@ export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9648,7 +9702,7 @@ export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9663,7 +9717,7 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9688,7 +9742,7 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9713,7 +9767,7 @@ export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9733,7 +9787,7 @@ export type AuthorizationServerListByServiceResponse = AuthorizationServerCollec
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9753,7 +9807,7 @@ export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEnti
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9768,7 +9822,7 @@ export type AuthorizationServerGetResponse = AuthorizationServerContract & Autho
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9793,7 +9847,7 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9818,7 +9872,7 @@ export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9838,7 +9892,7 @@ export type BackendListByServiceResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9858,7 +9912,7 @@ export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9873,7 +9927,7 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9898,7 +9952,7 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9923,7 +9977,7 @@ export type BackendListByServiceNextResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9943,7 +9997,7 @@ export type CacheListByServiceResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -9963,7 +10017,7 @@ export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -9978,7 +10032,7 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10003,7 +10057,7 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10028,7 +10082,7 @@ export type CacheListByServiceNextResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10048,7 +10102,7 @@ export type CertificateListByServiceResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10068,7 +10122,7 @@ export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10083,7 +10137,7 @@ export type CertificateGetResponse = CertificateContract & CertificateGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10108,7 +10162,7 @@ export type CertificateCreateOrUpdateResponse = CertificateContract & Certificat
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10133,7 +10187,7 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10153,7 +10207,7 @@ export type ApiManagementOperationsListResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10173,7 +10227,7 @@ export type ApiManagementOperationsListNextResponse = OperationListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10193,7 +10247,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusResponse = ResourceS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10213,7 +10267,7 @@ export type ApiManagementServiceSkusListAvailableServiceSkusNextResponse = Resou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10233,7 +10287,7 @@ export type ApiManagementServiceRestoreResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10253,7 +10307,7 @@ export type ApiManagementServiceBackupResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10273,7 +10327,7 @@ export type ApiManagementServiceCreateOrUpdateResponse = ApiManagementServiceRes
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10293,7 +10347,7 @@ export type ApiManagementServiceUpdateResponse = ApiManagementServiceResource &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10313,7 +10367,7 @@ export type ApiManagementServiceGetResponse = ApiManagementServiceResource & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10333,7 +10387,7 @@ export type ApiManagementServiceDeleteMethodResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10353,7 +10407,7 @@ export type ApiManagementServiceListByResourceGroupResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10373,7 +10427,7 @@ export type ApiManagementServiceListResponse = ApiManagementServiceListResult &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10393,7 +10447,7 @@ export type ApiManagementServiceGetSsoTokenResponse = ApiManagementServiceGetSso
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10413,7 +10467,7 @@ export type ApiManagementServiceCheckNameAvailabilityResponse = ApiManagementSer
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10433,7 +10487,7 @@ export type ApiManagementServiceApplyNetworkConfigurationUpdatesResponse = ApiMa
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10453,7 +10507,7 @@ export type ApiManagementServiceBeginRestoreResponse = ApiManagementServiceResou
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10473,7 +10527,7 @@ export type ApiManagementServiceBeginBackupResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10493,7 +10547,7 @@ export type ApiManagementServiceBeginCreateOrUpdateResponse = ApiManagementServi
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10513,7 +10567,7 @@ export type ApiManagementServiceBeginUpdateResponse = ApiManagementServiceResour
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10533,7 +10587,7 @@ export type ApiManagementServiceBeginDeleteMethodResponse = ApiManagementService
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10553,7 +10607,7 @@ export type ApiManagementServiceBeginApplyNetworkConfigurationUpdatesResponse =
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10573,7 +10627,7 @@ export type ApiManagementServiceListByResourceGroupNextResponse = ApiManagementS
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10593,7 +10647,7 @@ export type ApiManagementServiceListNextResponse = ApiManagementServiceListResul
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10613,7 +10667,7 @@ export type DiagnosticListByServiceResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10633,7 +10687,7 @@ export type DiagnosticGetEntityTagResponse = DiagnosticGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10648,7 +10702,7 @@ export type DiagnosticGetResponse = DiagnosticContract & DiagnosticGetHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10673,7 +10727,7 @@ export type DiagnosticCreateOrUpdateResponse = DiagnosticContract & DiagnosticCr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10698,7 +10752,7 @@ export type DiagnosticListByServiceNextResponse = DiagnosticCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10718,7 +10772,7 @@ export type EmailTemplateListByServiceResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10738,7 +10792,7 @@ export type EmailTemplateGetEntityTagResponse = EmailTemplateGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10753,7 +10807,7 @@ export type EmailTemplateGetResponse = EmailTemplateContract & EmailTemplateGetH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10778,7 +10832,7 @@ export type EmailTemplateCreateOrUpdateResponse = EmailTemplateContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10798,7 +10852,7 @@ export type EmailTemplateListByServiceNextResponse = EmailTemplateCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10818,7 +10872,7 @@ export type GroupListByServiceResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10838,7 +10892,7 @@ export type GroupGetEntityTagResponse = GroupGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10853,7 +10907,7 @@ export type GroupGetResponse = GroupContract & GroupGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10878,7 +10932,7 @@ export type GroupCreateOrUpdateResponse = GroupContract & GroupCreateOrUpdateHea
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -10903,7 +10957,7 @@ export type GroupListByServiceNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10923,7 +10977,7 @@ export type GroupUserListResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10948,7 +11002,7 @@ export type GroupUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10968,7 +11022,7 @@ export type GroupUserCreateResponse = UserContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -10988,7 +11042,7 @@ export type GroupUserListNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11008,7 +11062,7 @@ export type IdentityProviderListByServiceResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11028,7 +11082,7 @@ export type IdentityProviderGetEntityTagResponse = IdentityProviderGetEntityTagH
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11043,7 +11097,7 @@ export type IdentityProviderGetResponse = IdentityProviderContract & IdentityPro
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11068,7 +11122,7 @@ export type IdentityProviderCreateOrUpdateResponse = IdentityProviderContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11093,7 +11147,7 @@ export type IdentityProviderListByServiceNextResponse = IdentityProviderList & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11113,7 +11167,7 @@ export type IssueListByServiceResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11133,7 +11187,7 @@ export type IssueGetResponse = IssueContract & IssueGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11158,7 +11212,7 @@ export type IssueListByServiceNextResponse = IssueCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11178,7 +11232,7 @@ export type LoggerListByServiceResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11198,7 +11252,7 @@ export type LoggerGetEntityTagResponse = LoggerGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11213,7 +11267,7 @@ export type LoggerGetResponse = LoggerContract & LoggerGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11238,7 +11292,7 @@ export type LoggerCreateOrUpdateResponse = LoggerContract & LoggerCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11263,7 +11317,7 @@ export type LoggerListByServiceNextResponse = LoggerCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11283,7 +11337,7 @@ export type NetworkStatusListByServiceResponse = Array<NetworkStatusContractByLo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11303,7 +11357,7 @@ export type NetworkStatusListByLocationResponse = NetworkStatusContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11323,7 +11377,7 @@ export type NotificationListByServiceResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11343,7 +11397,7 @@ export type NotificationGetResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11363,7 +11417,7 @@ export type NotificationCreateOrUpdateResponse = NotificationContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11383,7 +11437,7 @@ export type NotificationListByServiceNextResponse = NotificationCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11403,7 +11457,7 @@ export type NotificationRecipientUserListByNotificationResponse = RecipientUserC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11428,7 +11482,7 @@ export type NotificationRecipientUserCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11448,7 +11502,7 @@ export type NotificationRecipientUserCreateOrUpdateResponse = RecipientUserContr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11468,7 +11522,7 @@ export type NotificationRecipientEmailListByNotificationResponse = RecipientEmai
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11493,7 +11547,7 @@ export type NotificationRecipientEmailCheckEntityExistsResponse = {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11513,7 +11567,7 @@ export type NotificationRecipientEmailCreateOrUpdateResponse = RecipientEmailCon
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11533,7 +11587,7 @@ export type OpenIdConnectProviderListByServiceResponse = OpenIdConnectProviderCo
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11553,7 +11607,7 @@ export type OpenIdConnectProviderGetEntityTagResponse = OpenIdConnectProviderGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11568,7 +11622,7 @@ export type OpenIdConnectProviderGetResponse = OpenidConnectProviderContract & O
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11593,7 +11647,7 @@ export type OpenIdConnectProviderCreateOrUpdateResponse = OpenidConnectProviderC
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11618,7 +11672,7 @@ export type OpenIdConnectProviderListByServiceNextResponse = OpenIdConnectProvid
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11638,7 +11692,7 @@ export type PolicyListByServiceResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11658,7 +11712,7 @@ export type PolicyGetEntityTagResponse = PolicyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11673,7 +11727,7 @@ export type PolicyGetResponse = PolicyContract & PolicyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11698,7 +11752,7 @@ export type PolicyCreateOrUpdateResponse = PolicyContract & PolicyCreateOrUpdate
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11723,7 +11777,7 @@ export type PolicySnippetListByServiceResponse = PolicySnippetsCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11743,7 +11797,7 @@ export type SignInSettingsGetEntityTagResponse = SignInSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11758,7 +11812,7 @@ export type SignInSettingsGetResponse = PortalSigninSettings & SignInSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11783,7 +11837,7 @@ export type SignInSettingsCreateOrUpdateResponse = PortalSigninSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11803,7 +11857,7 @@ export type SignUpSettingsGetEntityTagResponse = SignUpSettingsGetEntityTagHeade
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11818,7 +11872,7 @@ export type SignUpSettingsGetResponse = PortalSignupSettings & SignUpSettingsGet
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11843,7 +11897,7 @@ export type SignUpSettingsCreateOrUpdateResponse = PortalSignupSettings & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11863,7 +11917,7 @@ export type DelegationSettingsGetEntityTagResponse = DelegationSettingsGetEntity
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11878,7 +11932,7 @@ export type DelegationSettingsGetResponse = PortalDelegationSettings & Delegatio
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11903,7 +11957,7 @@ export type DelegationSettingsCreateOrUpdateResponse = PortalDelegationSettings
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11923,7 +11977,7 @@ export type ProductListByServiceResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -11943,7 +11997,7 @@ export type ProductGetEntityTagResponse = ProductGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11958,7 +12012,7 @@ export type ProductGetResponse = ProductContract & ProductGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -11983,7 +12037,7 @@ export type ProductCreateOrUpdateResponse = ProductContract & ProductCreateOrUpd
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12008,7 +12062,7 @@ export type ProductListByTagsResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12028,7 +12082,7 @@ export type ProductListByServiceNextResponse = ProductCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12048,7 +12102,7 @@ export type ProductListByTagsNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12068,7 +12122,7 @@ export type ProductApiListByProductResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12088,7 +12142,7 @@ export type ProductApiCreateOrUpdateResponse = ApiContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12108,7 +12162,7 @@ export type ProductApiListByProductNextResponse = ApiCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12128,7 +12182,7 @@ export type ProductGroupListByProductResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12148,7 +12202,7 @@ export type ProductGroupCreateOrUpdateResponse = GroupContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12168,7 +12222,7 @@ export type ProductGroupListByProductNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12188,7 +12242,7 @@ export type ProductSubscriptionsListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12208,7 +12262,7 @@ export type ProductSubscriptionsListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12228,7 +12282,7 @@ export type ProductPolicyListByProductResponse = PolicyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12248,7 +12302,7 @@ export type ProductPolicyGetEntityTagResponse = ProductPolicyGetEntityTagHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12263,7 +12317,7 @@ export type ProductPolicyGetResponse = PolicyContract & ProductPolicyGetHeaders
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12288,7 +12342,7 @@ export type ProductPolicyCreateOrUpdateResponse = PolicyContract & ProductPolicy
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12313,7 +12367,7 @@ export type PropertyListByServiceResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12333,7 +12387,7 @@ export type PropertyGetEntityTagResponse = PropertyGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12348,7 +12402,7 @@ export type PropertyGetResponse = PropertyContract & PropertyGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12373,7 +12427,7 @@ export type PropertyCreateOrUpdateResponse = PropertyContract & PropertyCreateOr
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12398,7 +12452,7 @@ export type PropertyListByServiceNextResponse = PropertyCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12418,7 +12472,7 @@ export type QuotaByCounterKeysListByServiceResponse = QuotaCounterCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12438,7 +12492,7 @@ export type QuotaByPeriodKeysGetResponse = QuotaCounterContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12458,7 +12512,7 @@ export type RegionListByServiceResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12478,7 +12532,7 @@ export type RegionListByServiceNextResponse = RegionListResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12498,7 +12552,7 @@ export type ReportsListByApiResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12518,7 +12572,7 @@ export type ReportsListByUserResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12538,7 +12592,7 @@ export type ReportsListByOperationResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12558,7 +12612,7 @@ export type ReportsListByProductResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12578,7 +12632,7 @@ export type ReportsListByGeoResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12598,7 +12652,7 @@ export type ReportsListBySubscriptionResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12618,7 +12672,7 @@ export type ReportsListByTimeResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12638,7 +12692,7 @@ export type ReportsListByRequestResponse = RequestReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12658,7 +12712,7 @@ export type ReportsListByApiNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12678,7 +12732,7 @@ export type ReportsListByUserNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12698,7 +12752,7 @@ export type ReportsListByOperationNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12718,7 +12772,7 @@ export type ReportsListByProductNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12738,7 +12792,7 @@ export type ReportsListByGeoNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12758,7 +12812,7 @@ export type ReportsListBySubscriptionNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12778,7 +12832,7 @@ export type ReportsListByTimeNextResponse = ReportCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12798,7 +12852,7 @@ export type SubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12818,7 +12872,7 @@ export type SubscriptionGetEntityTagResponse = SubscriptionGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12833,7 +12887,7 @@ export type SubscriptionGetResponse = SubscriptionContract & SubscriptionGetHead
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12858,7 +12912,7 @@ export type SubscriptionCreateOrUpdateResponse = SubscriptionContract & Subscrip
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12883,7 +12937,7 @@ export type SubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12903,7 +12957,7 @@ export type TagResourceListByServiceResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12923,7 +12977,7 @@ export type TagResourceListByServiceNextResponse = TagResourceCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -12943,7 +12997,7 @@ export type TenantAccessGetEntityTagResponse = TenantAccessGetEntityTagHeaders &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12958,7 +13012,7 @@ export type TenantAccessGetResponse = AccessInformationContract & TenantAccessGe
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -12983,7 +13037,7 @@ export type TenantAccessGitGetResponse = AccessInformationContract & TenantAcces
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13008,7 +13062,7 @@ export type TenantConfigurationDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13028,7 +13082,7 @@ export type TenantConfigurationSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13048,7 +13102,7 @@ export type TenantConfigurationValidateResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13068,7 +13122,7 @@ export type TenantConfigurationGetSyncStateResponse = TenantConfigurationSyncSta
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13088,7 +13142,7 @@ export type TenantConfigurationBeginDeployResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13108,7 +13162,7 @@ export type TenantConfigurationBeginSaveResponse = OperationResultContract & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13128,7 +13182,7 @@ export type TenantConfigurationBeginValidateResponse = OperationResultContract &
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13148,7 +13202,7 @@ export type UserListByServiceResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13168,7 +13222,7 @@ export type UserGetEntityTagResponse = UserGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13183,7 +13237,7 @@ export type UserGetResponse = UserContract & UserGetHeaders & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13208,7 +13262,7 @@ export type UserCreateOrUpdateResponse = UserContract & UserCreateOrUpdateHeader
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The parsed HTTP response headers.
        */
@@ -13233,7 +13287,7 @@ export type UserGenerateSsoUrlResponse = GenerateSsoUrlResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13253,7 +13307,7 @@ export type UserGetSharedAccessTokenResponse = UserTokenResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13273,7 +13327,7 @@ export type UserListByServiceNextResponse = UserCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13293,7 +13347,7 @@ export type UserGroupListResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13313,7 +13367,7 @@ export type UserGroupListNextResponse = GroupCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13333,7 +13387,7 @@ export type UserSubscriptionListResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13353,7 +13407,7 @@ export type UserSubscriptionListNextResponse = SubscriptionCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13373,7 +13427,7 @@ export type UserIdentitiesListResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13393,7 +13447,7 @@ export type UserIdentitiesListNextResponse = UserIdentityCollection & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
@@ -13413,7 +13467,7 @@ export type ApiExportGetResponse = ApiExportResult & {
   /**
    * The underlying HTTP response.
    */
-  _response: msRest.HttpResponse & {
+  _response: coreHttp.HttpResponse & {
       /**
        * The response body as text (string format)
        */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 6b65ce34b85f..60dd6c440a4f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -6,13 +6,13 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { CloudErrorMapper, BaseResourceMapper } from "@azure/core-arm";
+import * as coreHttp from "@azure/core-http";
 
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
 
-export const ErrorFieldContract: msRest.CompositeMapper = {
+export const ErrorFieldContract: coreHttp.CompositeMapper = {
   serializedName: "ErrorFieldContract",
   type: {
     name: "Composite",
@@ -40,7 +40,7 @@ export const ErrorFieldContract: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponseBody: msRest.CompositeMapper = {
+export const ErrorResponseBody: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponseBody",
   type: {
     name: "Composite",
@@ -74,7 +74,7 @@ export const ErrorResponseBody: msRest.CompositeMapper = {
   }
 };
 
-export const ErrorResponse: msRest.CompositeMapper = {
+export const ErrorResponse: coreHttp.CompositeMapper = {
   serializedName: "ErrorResponse",
   type: {
     name: "Composite",
@@ -108,7 +108,7 @@ export const ErrorResponse: msRest.CompositeMapper = {
   }
 };
 
-export const RegionContract: msRest.CompositeMapper = {
+export const RegionContract: coreHttp.CompositeMapper = {
   serializedName: "RegionContract",
   type: {
     name: "Composite",
@@ -137,7 +137,7 @@ export const RegionContract: msRest.CompositeMapper = {
   }
 };
 
-export const Resource: msRest.CompositeMapper = {
+export const Resource: coreHttp.CompositeMapper = {
   serializedName: "Resource",
   type: {
     name: "Composite",
@@ -168,7 +168,7 @@ export const Resource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResultValue: msRest.CompositeMapper = {
+export const ApiExportResultValue: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult_value",
   type: {
     name: "Composite",
@@ -184,7 +184,7 @@ export const ApiExportResultValue: msRest.CompositeMapper = {
   }
 };
 
-export const ApiExportResult: msRest.CompositeMapper = {
+export const ApiExportResult: coreHttp.CompositeMapper = {
   serializedName: "ApiExportResult",
   type: {
     name: "Composite",
@@ -213,7 +213,7 @@ export const ApiExportResult: msRest.CompositeMapper = {
   }
 };
 
-export const ProductEntityBaseParameters: msRest.CompositeMapper = {
+export const ProductEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductEntityBaseParameters",
   type: {
     name: "Composite",
@@ -267,7 +267,7 @@ export const ProductEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
+export const ProductTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ProductTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -295,7 +295,7 @@ export const ProductTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
+export const OperationTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "OperationTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -360,7 +360,7 @@ export const OperationTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
+export const SubscriptionKeyParameterNamesContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionKeyParameterNamesContract",
   type: {
     name: "Composite",
@@ -382,7 +382,7 @@ export const SubscriptionKeyParameterNamesContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OpenIdAuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OpenIdAuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -409,7 +409,7 @@ export const OpenIdAuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const OAuth2AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "OAuth2AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -431,7 +431,7 @@ export const OAuth2AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthenticationSettingsContract: msRest.CompositeMapper = {
+export const AuthenticationSettingsContract: coreHttp.CompositeMapper = {
   serializedName: "AuthenticationSettingsContract",
   type: {
     name: "Composite",
@@ -461,7 +461,7 @@ export const AuthenticationSettingsContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
+export const ApiVersionSetContractDetails: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContractDetails",
   type: {
     name: "Composite",
@@ -507,7 +507,7 @@ export const ApiVersionSetContractDetails: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
+export const ApiCreateOrUpdatePropertiesWsdlSelector: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateProperties_wsdlSelector",
   type: {
     name: "Composite",
@@ -529,7 +529,7 @@ export const ApiCreateOrUpdatePropertiesWsdlSelector: msRest.CompositeMapper = {
   }
 };
 
-export const ApiEntityBaseContract: msRest.CompositeMapper = {
+export const ApiEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiEntityBaseContract",
   type: {
     name: "Composite",
@@ -627,7 +627,7 @@ export const ApiEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContractProperties: msRest.CompositeMapper = {
+export const ApiContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiContractProperties",
   type: {
     name: "Composite",
@@ -697,7 +697,7 @@ export const ApiContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
+export const ApiTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -759,7 +759,7 @@ export const ApiTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagTagResourceContractProperties: msRest.CompositeMapper = {
+export const TagTagResourceContractProperties: coreHttp.CompositeMapper = {
   serializedName: "TagTagResourceContractProperties",
   type: {
     name: "Composite",
@@ -785,7 +785,7 @@ export const TagTagResourceContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceContract: msRest.CompositeMapper = {
+export const TagResourceContract: coreHttp.CompositeMapper = {
   serializedName: "TagResourceContract",
   type: {
     name: "Composite",
@@ -824,7 +824,7 @@ export const TagResourceContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagContract: msRest.CompositeMapper = {
+export const TagContract: coreHttp.CompositeMapper = {
   serializedName: "TagContract",
   type: {
     name: "Composite",
@@ -846,7 +846,7 @@ export const TagContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionContract: msRest.CompositeMapper = {
+export const TagDescriptionContract: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionContract",
   type: {
     name: "Composite",
@@ -888,7 +888,7 @@ export const TagDescriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
+export const TagDescriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCreateParameters",
   type: {
     name: "Composite",
@@ -919,7 +919,7 @@ export const TagDescriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentContract: msRest.CompositeMapper = {
+export const IssueAttachmentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentContract",
   type: {
     name: "Composite",
@@ -951,7 +951,7 @@ export const IssueAttachmentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentContract: msRest.CompositeMapper = {
+export const IssueCommentContract: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentContract",
   type: {
     name: "Composite",
@@ -982,7 +982,7 @@ export const IssueCommentContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContractBaseProperties: msRest.CompositeMapper = {
+export const IssueContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "IssueContractBaseProperties",
   type: {
     name: "Composite",
@@ -1010,7 +1010,7 @@ export const IssueContractBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const IssueUpdateContract: msRest.CompositeMapper = {
+export const IssueUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "IssueUpdateContract",
   type: {
     name: "Composite",
@@ -1056,7 +1056,7 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContract: msRest.CompositeMapper = {
+export const IssueContract: coreHttp.CompositeMapper = {
   serializedName: "IssueContract",
   type: {
     name: "Composite",
@@ -1106,7 +1106,7 @@ export const IssueContract: msRest.CompositeMapper = {
   }
 };
 
-export const BodyDiagnosticSettings: msRest.CompositeMapper = {
+export const BodyDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "BodyDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1125,7 +1125,7 @@ export const BodyDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const HttpMessageDiagnostic: msRest.CompositeMapper = {
+export const HttpMessageDiagnostic: coreHttp.CompositeMapper = {
   serializedName: "HttpMessageDiagnostic",
   type: {
     name: "Composite",
@@ -1153,7 +1153,7 @@ export const HttpMessageDiagnostic: msRest.CompositeMapper = {
   }
 };
 
-export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
+export const PipelineDiagnosticSettings: coreHttp.CompositeMapper = {
   serializedName: "PipelineDiagnosticSettings",
   type: {
     name: "Composite",
@@ -1177,7 +1177,7 @@ export const PipelineDiagnosticSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SamplingSettings: msRest.CompositeMapper = {
+export const SamplingSettings: coreHttp.CompositeMapper = {
   serializedName: "SamplingSettings",
   type: {
     name: "Composite",
@@ -1203,7 +1203,7 @@ export const SamplingSettings: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticContract: msRest.CompositeMapper = {
+export const DiagnosticContract: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticContract",
   type: {
     name: "Composite",
@@ -1254,7 +1254,7 @@ export const DiagnosticContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaContract: msRest.CompositeMapper = {
+export const SchemaContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaContract",
   type: {
     name: "Composite",
@@ -1278,7 +1278,7 @@ export const SchemaContract: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
+export const SchemaCreateOrUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "SchemaCreateOrUpdateContract",
   type: {
     name: "Composite",
@@ -1302,7 +1302,7 @@ export const SchemaCreateOrUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyContract: msRest.CompositeMapper = {
+export const PolicyContract: coreHttp.CompositeMapper = {
   serializedName: "PolicyContract",
   type: {
     name: "Composite",
@@ -1327,7 +1327,7 @@ export const PolicyContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCollection: msRest.CompositeMapper = {
+export const PolicyCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicyCollection",
   type: {
     name: "Composite",
@@ -1355,7 +1355,7 @@ export const PolicyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductContract: msRest.CompositeMapper = {
+export const ProductContract: coreHttp.CompositeMapper = {
   serializedName: "ProductContract",
   type: {
     name: "Composite",
@@ -1421,7 +1421,7 @@ export const ProductContract: msRest.CompositeMapper = {
   }
 };
 
-export const ParameterContract: msRest.CompositeMapper = {
+export const ParameterContract: coreHttp.CompositeMapper = {
   serializedName: "ParameterContract",
   type: {
     name: "Composite",
@@ -1474,7 +1474,7 @@ export const ParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const RepresentationContract: msRest.CompositeMapper = {
+export const RepresentationContract: coreHttp.CompositeMapper = {
   serializedName: "RepresentationContract",
   type: {
     name: "Composite",
@@ -1521,7 +1521,7 @@ export const RepresentationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResponseContract: msRest.CompositeMapper = {
+export const ResponseContract: coreHttp.CompositeMapper = {
   serializedName: "ResponseContract",
   type: {
     name: "Composite",
@@ -1568,7 +1568,7 @@ export const ResponseContract: msRest.CompositeMapper = {
   }
 };
 
-export const RequestContract: msRest.CompositeMapper = {
+export const RequestContract: coreHttp.CompositeMapper = {
   serializedName: "RequestContract",
   type: {
     name: "Composite",
@@ -1620,7 +1620,7 @@ export const RequestContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationEntityBaseContract: msRest.CompositeMapper = {
+export const OperationEntityBaseContract: coreHttp.CompositeMapper = {
   serializedName: "OperationEntityBaseContract",
   type: {
     name: "Composite",
@@ -1676,7 +1676,7 @@ export const OperationEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationUpdateContract: msRest.CompositeMapper = {
+export const OperationUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OperationUpdateContract",
   type: {
     name: "Composite",
@@ -1758,7 +1758,7 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationContract: msRest.CompositeMapper = {
+export const OperationContract: coreHttp.CompositeMapper = {
   serializedName: "OperationContract",
   type: {
     name: "Composite",
@@ -1844,7 +1844,7 @@ export const OperationContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseContract: msRest.CompositeMapper = {
+export const ApiReleaseContract: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseContract",
   type: {
     name: "Composite",
@@ -1881,7 +1881,7 @@ export const ApiReleaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionContract: msRest.CompositeMapper = {
+export const ApiRevisionContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionContract",
   type: {
     name: "Composite",
@@ -1954,7 +1954,7 @@ export const ApiRevisionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiUpdateContract: msRest.CompositeMapper = {
+export const ApiUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "ApiUpdateContract",
   type: {
     name: "Composite",
@@ -2097,7 +2097,7 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiContract: msRest.CompositeMapper = {
+export const ApiContract: coreHttp.CompositeMapper = {
   serializedName: "ApiContract",
   type: {
     name: "Composite",
@@ -2255,7 +2255,7 @@ export const ApiContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateParameter: coreHttp.CompositeMapper = {
   serializedName: "ApiCreateOrUpdateParameter",
   type: {
     name: "Composite",
@@ -2437,7 +2437,7 @@ export const ApiCreateOrUpdateParameter: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
+export const ApiVersionSetEntityBase: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetEntityBase",
   type: {
     name: "Composite",
@@ -2473,7 +2473,7 @@ export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
+export const ApiVersionSetUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetUpdateParameters",
   type: {
     name: "Composite",
@@ -2525,7 +2525,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContract: msRest.CompositeMapper = {
+export const ApiVersionSetContract: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetContract",
   type: {
     name: "Composite",
@@ -2580,7 +2580,7 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
   }
 };
 
-export const TokenBodyParameterContract: msRest.CompositeMapper = {
+export const TokenBodyParameterContract: coreHttp.CompositeMapper = {
   serializedName: "TokenBodyParameterContract",
   type: {
     name: "Composite",
@@ -2604,7 +2604,7 @@ export const TokenBodyParameterContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper = {
+export const AuthorizationServerContractBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContractBaseProperties",
   type: {
     name: "Composite",
@@ -2711,7 +2711,7 @@ export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper =
   }
 };
 
-export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
+export const AuthorizationServerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerUpdateContract",
   type: {
     name: "Composite",
@@ -2858,7 +2858,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContract: msRest.CompositeMapper = {
+export const AuthorizationServerContract: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerContract",
   type: {
     name: "Composite",
@@ -3010,7 +3010,7 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendReconnectContract: msRest.CompositeMapper = {
+export const BackendReconnectContract: coreHttp.CompositeMapper = {
   serializedName: "BackendReconnectContract",
   type: {
     name: "Composite",
@@ -3027,7 +3027,7 @@ export const BackendReconnectContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendTlsProperties: msRest.CompositeMapper = {
+export const BackendTlsProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendTlsProperties",
   type: {
     name: "Composite",
@@ -3051,7 +3051,7 @@ export const BackendTlsProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProxyContract: msRest.CompositeMapper = {
+export const BackendProxyContract: coreHttp.CompositeMapper = {
   serializedName: "BackendProxyContract",
   type: {
     name: "Composite",
@@ -3084,7 +3084,7 @@ export const BackendProxyContract: msRest.CompositeMapper = {
   }
 };
 
-export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
+export const BackendAuthorizationHeaderCredentials: coreHttp.CompositeMapper = {
   serializedName: "BackendAuthorizationHeaderCredentials",
   type: {
     name: "Composite",
@@ -3116,7 +3116,7 @@ export const BackendAuthorizationHeaderCredentials: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCredentialsContract: msRest.CompositeMapper = {
+export const BackendCredentialsContract: coreHttp.CompositeMapper = {
   serializedName: "BackendCredentialsContract",
   type: {
     name: "Composite",
@@ -3179,7 +3179,7 @@ export const BackendCredentialsContract: msRest.CompositeMapper = {
   }
 };
 
-export const X509CertificateName: msRest.CompositeMapper = {
+export const X509CertificateName: coreHttp.CompositeMapper = {
   serializedName: "X509CertificateName",
   type: {
     name: "Composite",
@@ -3201,7 +3201,7 @@ export const X509CertificateName: msRest.CompositeMapper = {
   }
 };
 
-export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
+export const BackendServiceFabricClusterProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendServiceFabricClusterProperties",
   type: {
     name: "Composite",
@@ -3259,7 +3259,7 @@ export const BackendServiceFabricClusterProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendProperties: msRest.CompositeMapper = {
+export const BackendProperties: coreHttp.CompositeMapper = {
   serializedName: "BackendProperties",
   type: {
     name: "Composite",
@@ -3276,7 +3276,7 @@ export const BackendProperties: msRest.CompositeMapper = {
   }
 };
 
-export const BackendBaseParameters: msRest.CompositeMapper = {
+export const BackendBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendBaseParameters",
   type: {
     name: "Composite",
@@ -3344,7 +3344,7 @@ export const BackendBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendUpdateParameters: msRest.CompositeMapper = {
+export const BackendUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "BackendUpdateParameters",
   type: {
     name: "Composite",
@@ -3428,7 +3428,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendContract: msRest.CompositeMapper = {
+export const BackendContract: coreHttp.CompositeMapper = {
   serializedName: "BackendContract",
   type: {
     name: "Composite",
@@ -3515,7 +3515,7 @@ export const BackendContract: msRest.CompositeMapper = {
   }
 };
 
-export const CacheUpdateParameters: msRest.CompositeMapper = {
+export const CacheUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CacheUpdateParameters",
   type: {
     name: "Composite",
@@ -3552,7 +3552,7 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const CacheContract: msRest.CompositeMapper = {
+export const CacheContract: coreHttp.CompositeMapper = {
   serializedName: "CacheContract",
   type: {
     name: "Composite",
@@ -3591,7 +3591,7 @@ export const CacheContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateContract: msRest.CompositeMapper = {
+export const CertificateContract: coreHttp.CompositeMapper = {
   serializedName: "CertificateContract",
   type: {
     name: "Composite",
@@ -3623,7 +3623,7 @@ export const CertificateContract: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "CertificateCreateOrUpdateParameters",
   type: {
     name: "Composite",
@@ -3647,7 +3647,7 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSku: msRest.CompositeMapper = {
+export const ResourceSku: coreHttp.CompositeMapper = {
   serializedName: "ResourceSku",
   type: {
     name: "Composite",
@@ -3663,7 +3663,7 @@ export const ResourceSku: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuCapacity: msRest.CompositeMapper = {
+export const ResourceSkuCapacity: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuCapacity",
   type: {
     name: "Composite",
@@ -3701,7 +3701,7 @@ export const ResourceSkuCapacity: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResult: msRest.CompositeMapper = {
+export const ResourceSkuResult: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResult",
   type: {
     name: "Composite",
@@ -3734,7 +3734,7 @@ export const ResourceSkuResult: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateInformation: msRest.CompositeMapper = {
+export const CertificateInformation: coreHttp.CompositeMapper = {
   serializedName: "CertificateInformation",
   type: {
     name: "Composite",
@@ -3765,7 +3765,7 @@ export const CertificateInformation: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateConfiguration: msRest.CompositeMapper = {
+export const CertificateConfiguration: coreHttp.CompositeMapper = {
   serializedName: "CertificateConfiguration",
   type: {
     name: "Composite",
@@ -3801,7 +3801,7 @@ export const CertificateConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const HostnameConfiguration: msRest.CompositeMapper = {
+export const HostnameConfiguration: coreHttp.CompositeMapper = {
   serializedName: "HostnameConfiguration",
   type: {
     name: "Composite",
@@ -3864,7 +3864,7 @@ export const HostnameConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
+export const VirtualNetworkConfiguration: coreHttp.CompositeMapper = {
   serializedName: "VirtualNetworkConfiguration",
   type: {
     name: "Composite",
@@ -3897,7 +3897,7 @@ export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceSkuProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceSkuProperties",
   type: {
     name: "Composite",
@@ -3920,7 +3920,7 @@ export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
   }
 };
 
-export const AdditionalLocation: msRest.CompositeMapper = {
+export const AdditionalLocation: coreHttp.CompositeMapper = {
   serializedName: "AdditionalLocation",
   type: {
     name: "Composite",
@@ -3983,7 +3983,7 @@ export const AdditionalLocation: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceBackupRestoreParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBackupRestoreParameters",
   type: {
     name: "Composite",
@@ -4021,7 +4021,7 @@ export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
+export const ApiManagementServiceBaseProperties: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceBaseProperties",
   type: {
     name: "Composite",
@@ -4188,7 +4188,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
+export const ApiManagementServiceIdentity: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceIdentity",
   type: {
     name: "Composite",
@@ -4221,7 +4221,7 @@ export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
   }
 };
 
-export const ApimResource: msRest.CompositeMapper = {
+export const ApimResource: coreHttp.CompositeMapper = {
   serializedName: "ApimResource",
   type: {
     name: "Composite",
@@ -4263,7 +4263,7 @@ export const ApimResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceResource: msRest.CompositeMapper = {
+export const ApiManagementServiceResource: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceResource",
   type: {
     name: "Composite",
@@ -4480,7 +4480,7 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceUpdateParameters",
   type: {
     name: "Composite",
@@ -4687,7 +4687,7 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
+export const ApiManagementServiceGetSsoTokenResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceGetSsoTokenResult",
   type: {
     name: "Composite",
@@ -4703,7 +4703,7 @@ export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceCheckNameAvailabilityParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
   type: {
     name: "Composite",
@@ -4720,7 +4720,7 @@ export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.Composi
   }
 };
 
-export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
+export const ApiManagementServiceNameAvailabilityResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceNameAvailabilityResult",
   type: {
     name: "Composite",
@@ -4755,7 +4755,7 @@ export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper
   }
 };
 
-export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
+export const ApiManagementServiceApplyNetworkConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
   type: {
     name: "Composite",
@@ -4771,7 +4771,7 @@ export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.Com
   }
 };
 
-export const OperationDisplay: msRest.CompositeMapper = {
+export const OperationDisplay: coreHttp.CompositeMapper = {
   serializedName: "Operation_display",
   type: {
     name: "Composite",
@@ -4805,7 +4805,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
   }
 };
 
-export const Operation: msRest.CompositeMapper = {
+export const Operation: coreHttp.CompositeMapper = {
   serializedName: "Operation",
   type: {
     name: "Composite",
@@ -4840,7 +4840,7 @@ export const Operation: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
+export const EmailTemplateParametersContractProperties: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateParametersContractProperties",
   type: {
     name: "Composite",
@@ -4882,7 +4882,7 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+export const EmailTemplateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateUpdateParameters",
   type: {
     name: "Composite",
@@ -4935,7 +4935,7 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
+export const EmailTemplateContract: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateContract",
   type: {
     name: "Composite",
@@ -4998,7 +4998,7 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityContract: msRest.CompositeMapper = {
+export const UserIdentityContract: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityContract",
   type: {
     name: "Composite",
@@ -5020,7 +5020,7 @@ export const UserIdentityContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserEntityBaseParameters: msRest.CompositeMapper = {
+export const UserEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "UserEntityBaseParameters",
   type: {
     name: "Composite",
@@ -5055,7 +5055,7 @@ export const UserEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContractProperties: msRest.CompositeMapper = {
+export const GroupContractProperties: coreHttp.CompositeMapper = {
   serializedName: "GroupContractProperties",
   type: {
     name: "Composite",
@@ -5109,7 +5109,7 @@ export const GroupContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const UserContract: msRest.CompositeMapper = {
+export const UserContract: coreHttp.CompositeMapper = {
   serializedName: "UserContract",
   type: {
     name: "Composite",
@@ -5182,7 +5182,7 @@ export const UserContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupUpdateParameters: msRest.CompositeMapper = {
+export const GroupUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
@@ -5225,7 +5225,7 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContract: msRest.CompositeMapper = {
+export const GroupContract: coreHttp.CompositeMapper = {
   serializedName: "GroupContract",
   type: {
     name: "Composite",
@@ -5280,7 +5280,7 @@ export const GroupContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateParameters: msRest.CompositeMapper = {
+export const GroupCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "GroupCreateParameters",
   type: {
     name: "Composite",
@@ -5324,7 +5324,7 @@ export const GroupCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
+export const IdentityProviderBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderBaseParameters",
   type: {
     name: "Composite",
@@ -5396,7 +5396,7 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+export const IdentityProviderUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
@@ -5486,7 +5486,7 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
+export const IdentityProviderContract: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
@@ -5579,7 +5579,7 @@ export const IdentityProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerUpdateContract: msRest.CompositeMapper = {
+export const LoggerUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerUpdateContract",
   type: {
     name: "Composite",
@@ -5618,7 +5618,7 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerContract: msRest.CompositeMapper = {
+export const LoggerContract: coreHttp.CompositeMapper = {
   serializedName: "LoggerContract",
   type: {
     name: "Composite",
@@ -5669,7 +5669,7 @@ export const LoggerContract: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityStatusContract: msRest.CompositeMapper = {
+export const ConnectivityStatusContract: coreHttp.CompositeMapper = {
   serializedName: "ConnectivityStatusContract",
   type: {
     name: "Composite",
@@ -5716,7 +5716,7 @@ export const ConnectivityStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContract: msRest.CompositeMapper = {
+export const NetworkStatusContract: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContract",
   type: {
     name: "Composite",
@@ -5751,7 +5751,7 @@ export const NetworkStatusContract: msRest.CompositeMapper = {
   }
 };
 
-export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
+export const NetworkStatusContractByLocation: coreHttp.CompositeMapper = {
   serializedName: "NetworkStatusContractByLocation",
   type: {
     name: "Composite",
@@ -5777,7 +5777,7 @@ export const NetworkStatusContractByLocation: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailContract: msRest.CompositeMapper = {
+export const RecipientEmailContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailContract",
   type: {
     name: "Composite",
@@ -5794,7 +5794,7 @@ export const RecipientEmailContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientEmailCollection: msRest.CompositeMapper = {
+export const RecipientEmailCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientEmailCollection",
   type: {
     name: "Composite",
@@ -5822,7 +5822,7 @@ export const RecipientEmailCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserContract: msRest.CompositeMapper = {
+export const RecipientUserContract: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserContract",
   type: {
     name: "Composite",
@@ -5839,7 +5839,7 @@ export const RecipientUserContract: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientUserCollection: msRest.CompositeMapper = {
+export const RecipientUserCollection: coreHttp.CompositeMapper = {
   serializedName: "RecipientUserCollection",
   type: {
     name: "Composite",
@@ -5867,7 +5867,7 @@ export const RecipientUserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RecipientsContractProperties: msRest.CompositeMapper = {
+export const RecipientsContractProperties: coreHttp.CompositeMapper = {
   serializedName: "RecipientsContractProperties",
   type: {
     name: "Composite",
@@ -5899,7 +5899,7 @@ export const RecipientsContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationContract: msRest.CompositeMapper = {
+export const NotificationContract: coreHttp.CompositeMapper = {
   serializedName: "NotificationContract",
   type: {
     name: "Composite",
@@ -5934,7 +5934,7 @@ export const NotificationContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderUpdateContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderUpdateContract",
   type: {
     name: "Composite",
@@ -5977,7 +5977,7 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderContract: msRest.CompositeMapper = {
+export const OpenidConnectProviderContract: coreHttp.CompositeMapper = {
   serializedName: "OpenidConnectProviderContract",
   type: {
     name: "Composite",
@@ -6024,7 +6024,7 @@ export const OpenidConnectProviderContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetContract: msRest.CompositeMapper = {
+export const PolicySnippetContract: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetContract",
   type: {
     name: "Composite",
@@ -6062,7 +6062,7 @@ export const PolicySnippetContract: msRest.CompositeMapper = {
   }
 };
 
-export const PolicySnippetsCollection: msRest.CompositeMapper = {
+export const PolicySnippetsCollection: coreHttp.CompositeMapper = {
   serializedName: "PolicySnippetsCollection",
   type: {
     name: "Composite",
@@ -6084,7 +6084,7 @@ export const PolicySnippetsCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper = {
+export const RegistrationDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "RegistrationDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6100,7 +6100,7 @@ export const RegistrationDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper = {
+export const SubscriptionsDelegationSettingsProperties: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionsDelegationSettingsProperties",
   type: {
     name: "Composite",
@@ -6116,7 +6116,7 @@ export const SubscriptionsDelegationSettingsProperties: msRest.CompositeMapper =
   }
 };
 
-export const PortalDelegationSettings: msRest.CompositeMapper = {
+export const PortalDelegationSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalDelegationSettings",
   type: {
     name: "Composite",
@@ -6153,7 +6153,7 @@ export const PortalDelegationSettings: msRest.CompositeMapper = {
   }
 };
 
-export const TermsOfServiceProperties: msRest.CompositeMapper = {
+export const TermsOfServiceProperties: coreHttp.CompositeMapper = {
   serializedName: "TermsOfServiceProperties",
   type: {
     name: "Composite",
@@ -6181,7 +6181,7 @@ export const TermsOfServiceProperties: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSignupSettings: msRest.CompositeMapper = {
+export const PortalSignupSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSignupSettings",
   type: {
     name: "Composite",
@@ -6205,7 +6205,7 @@ export const PortalSignupSettings: msRest.CompositeMapper = {
   }
 };
 
-export const PortalSigninSettings: msRest.CompositeMapper = {
+export const PortalSigninSettings: coreHttp.CompositeMapper = {
   serializedName: "PortalSigninSettings",
   type: {
     name: "Composite",
@@ -6222,7 +6222,7 @@ export const PortalSigninSettings: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionContract: msRest.CompositeMapper = {
+export const SubscriptionContract: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionContract",
   type: {
     name: "Composite",
@@ -6336,7 +6336,7 @@ export const SubscriptionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ProductUpdateParameters: msRest.CompositeMapper = {
+export const ProductUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "ProductUpdateParameters",
   type: {
     name: "Composite",
@@ -6400,7 +6400,7 @@ export const ProductUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
+export const PropertyEntityBaseParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyEntityBaseParameters",
   type: {
     name: "Composite",
@@ -6430,7 +6430,7 @@ export const PropertyEntityBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyUpdateParameters: msRest.CompositeMapper = {
+export const PropertyUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "PropertyUpdateParameters",
   type: {
     name: "Composite",
@@ -6481,7 +6481,7 @@ export const PropertyUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyContract: msRest.CompositeMapper = {
+export const PropertyContract: coreHttp.CompositeMapper = {
   serializedName: "PropertyContract",
   type: {
     name: "Composite",
@@ -6535,7 +6535,7 @@ export const PropertyContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
+export const QuotaCounterValueContractProperties: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContractProperties",
   type: {
     name: "Composite",
@@ -6557,7 +6557,7 @@ export const QuotaCounterValueContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterContract: msRest.CompositeMapper = {
+export const QuotaCounterContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterContract",
   type: {
     name: "Composite",
@@ -6608,7 +6608,7 @@ export const QuotaCounterContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterCollection: msRest.CompositeMapper = {
+export const QuotaCounterCollection: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterCollection",
   type: {
     name: "Composite",
@@ -6642,7 +6642,7 @@ export const QuotaCounterCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportRecordContract: msRest.CompositeMapper = {
+export const RequestReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "RequestReportRecordContract",
   type: {
     name: "Composite",
@@ -6762,7 +6762,7 @@ export const RequestReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const ReportRecordContract: msRest.CompositeMapper = {
+export const ReportRecordContract: coreHttp.CompositeMapper = {
   serializedName: "ReportRecordContract",
   type: {
     name: "Composite",
@@ -6930,7 +6930,7 @@ export const ReportRecordContract: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
+export const SubscriptionUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionUpdateParameters",
   type: {
     name: "Composite",
@@ -7010,7 +7010,7 @@ export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateParameters: msRest.CompositeMapper = {
+export const SubscriptionCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCreateParameters",
   type: {
     name: "Composite",
@@ -7084,7 +7084,7 @@ export const SubscriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateUpdateParameters: msRest.CompositeMapper = {
+export const TagCreateUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "TagCreateUpdateParameters",
   type: {
     name: "Composite",
@@ -7105,7 +7105,7 @@ export const TagCreateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
+export const TenantConfigurationSyncStateContract: coreHttp.CompositeMapper = {
   serializedName: "TenantConfigurationSyncStateContract",
   type: {
     name: "Composite",
@@ -7157,7 +7157,7 @@ export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultLogItemContract: msRest.CompositeMapper = {
+export const OperationResultLogItemContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultLogItemContract",
   type: {
     name: "Composite",
@@ -7185,7 +7185,7 @@ export const OperationResultLogItemContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultContract: msRest.CompositeMapper = {
+export const OperationResultContract: coreHttp.CompositeMapper = {
   serializedName: "OperationResultContract",
   type: {
     name: "Composite",
@@ -7251,7 +7251,7 @@ export const OperationResultContract: msRest.CompositeMapper = {
   }
 };
 
-export const DeployConfigurationParameters: msRest.CompositeMapper = {
+export const DeployConfigurationParameters: coreHttp.CompositeMapper = {
   serializedName: "DeployConfigurationParameters",
   type: {
     name: "Composite",
@@ -7274,7 +7274,7 @@ export const DeployConfigurationParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SaveConfigurationParameter: msRest.CompositeMapper = {
+export const SaveConfigurationParameter: coreHttp.CompositeMapper = {
   serializedName: "SaveConfigurationParameter",
   type: {
     name: "Composite",
@@ -7297,7 +7297,7 @@ export const SaveConfigurationParameter: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationContract: msRest.CompositeMapper = {
+export const AccessInformationContract: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationContract",
   type: {
     name: "Composite",
@@ -7331,7 +7331,7 @@ export const AccessInformationContract: msRest.CompositeMapper = {
   }
 };
 
-export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
+export const AccessInformationUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "AccessInformationUpdateParameters",
   type: {
     name: "Composite",
@@ -7347,7 +7347,7 @@ export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenResult: msRest.CompositeMapper = {
+export const UserTokenResult: coreHttp.CompositeMapper = {
   serializedName: "UserTokenResult",
   type: {
     name: "Composite",
@@ -7363,7 +7363,7 @@ export const UserTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenParameters: msRest.CompositeMapper = {
+export const UserTokenParameters: coreHttp.CompositeMapper = {
   serializedName: "UserTokenParameters",
   type: {
     name: "Composite",
@@ -7392,7 +7392,7 @@ export const UserTokenParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GenerateSsoUrlResult: msRest.CompositeMapper = {
+export const GenerateSsoUrlResult: coreHttp.CompositeMapper = {
   serializedName: "GenerateSsoUrlResult",
   type: {
     name: "Composite",
@@ -7408,7 +7408,7 @@ export const GenerateSsoUrlResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserUpdateParameters: msRest.CompositeMapper = {
+export const UserUpdateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserUpdateParameters",
   type: {
     name: "Composite",
@@ -7479,7 +7479,7 @@ export const UserUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateParameters: msRest.CompositeMapper = {
+export const UserCreateParameters: coreHttp.CompositeMapper = {
   serializedName: "UserCreateParameters",
   type: {
     name: "Composite",
@@ -7559,7 +7559,7 @@ export const UserCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionInfoContract: msRest.CompositeMapper = {
+export const ApiRevisionInfoContract: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionInfoContract",
   type: {
     name: "Composite",
@@ -7600,7 +7600,7 @@ export const ApiRevisionInfoContract: msRest.CompositeMapper = {
   }
 };
 
-export const QuotaCounterValueContract: msRest.CompositeMapper = {
+export const QuotaCounterValueContract: coreHttp.CompositeMapper = {
   serializedName: "QuotaCounterValueContract",
   type: {
     name: "Composite",
@@ -7622,7 +7622,7 @@ export const QuotaCounterValueContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7638,7 +7638,7 @@ export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiGetHeaders: msRest.CompositeMapper = {
+export const ApiGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-get-headers",
   type: {
     name: "Composite",
@@ -7654,7 +7654,7 @@ export const ApiGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "api-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7670,7 +7670,7 @@ export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7686,7 +7686,7 @@ export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
+export const ApiReleaseGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-get-headers",
   type: {
     name: "Composite",
@@ -7702,7 +7702,7 @@ export const ApiReleaseGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiReleaseCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apirelease-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7718,7 +7718,7 @@ export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7734,7 +7734,7 @@ export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-get-headers",
   type: {
     name: "Composite",
@@ -7750,7 +7750,7 @@ export const ApiOperationGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperation-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7766,7 +7766,7 @@ export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7782,7 +7782,7 @@ export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-get-headers",
   type: {
     name: "Composite",
@@ -7798,7 +7798,7 @@ export const ApiOperationPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiOperationPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apioperationpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7814,7 +7814,7 @@ export const ApiOperationPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyoperation-headers",
   type: {
     name: "Composite",
@@ -7830,7 +7830,7 @@ export const TagGetEntityStateByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByOperationHeaders: msRest.CompositeMapper = {
+export const TagGetByOperationHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyoperation-headers",
   type: {
     name: "Composite",
@@ -7846,7 +7846,7 @@ export const TagGetByOperationHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7862,7 +7862,7 @@ export const ApiPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
+export const ApiPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-get-headers",
   type: {
     name: "Composite",
@@ -7878,7 +7878,7 @@ export const ApiPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apipolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7894,7 +7894,7 @@ export const ApiPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7910,7 +7910,7 @@ export const ApiSchemaGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
+export const ApiSchemaGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-get-headers",
   type: {
     name: "Composite",
@@ -7926,7 +7926,7 @@ export const ApiSchemaGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiSchemaCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apischema-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7942,7 +7942,7 @@ export const ApiSchemaCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -7958,7 +7958,7 @@ export const ApiDiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-get-headers",
   type: {
     name: "Composite",
@@ -7974,7 +7974,7 @@ export const ApiDiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiDiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apidiagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -7990,7 +7990,7 @@ export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8006,7 +8006,7 @@ export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-get-headers",
   type: {
     name: "Composite",
@@ -8022,7 +8022,7 @@ export const ApiIssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissue-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8038,7 +8038,7 @@ export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8054,7 +8054,7 @@ export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-get-headers",
   type: {
     name: "Composite",
@@ -8070,7 +8070,7 @@ export const ApiIssueCommentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueCommentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissuecomment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8086,7 +8086,7 @@ export const ApiIssueCommentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8102,7 +8102,7 @@ export const ApiIssueAttachmentGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-get-headers",
   type: {
     name: "Composite",
@@ -8118,7 +8118,7 @@ export const ApiIssueAttachmentGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiIssueAttachmentCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiissueattachment-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8134,7 +8134,7 @@ export const ApiIssueAttachmentCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8150,7 +8150,7 @@ export const ApiTagDescriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-get-headers",
   type: {
     name: "Composite",
@@ -8166,7 +8166,7 @@ export const ApiTagDescriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiTagDescriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apitagdescription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8182,7 +8182,7 @@ export const ApiTagDescriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyapi-headers",
   type: {
     name: "Composite",
@@ -8198,7 +8198,7 @@ export const TagGetEntityStateByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByApiHeaders: msRest.CompositeMapper = {
+export const TagGetByApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyapi-headers",
   type: {
     name: "Composite",
@@ -8214,7 +8214,7 @@ export const TagGetByApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagAssignToApiHeaders: msRest.CompositeMapper = {
+export const TagAssignToApiHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-assigntoapi-headers",
   type: {
     name: "Composite",
@@ -8230,7 +8230,7 @@ export const TagAssignToApiHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8246,7 +8246,7 @@ export const ApiVersionSetGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-get-headers",
   type: {
     name: "Composite",
@@ -8262,7 +8262,7 @@ export const ApiVersionSetGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ApiVersionSetCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "apiversionset-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8278,7 +8278,7 @@ export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8294,7 +8294,7 @@ export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-get-headers",
   type: {
     name: "Composite",
@@ -8310,7 +8310,7 @@ export const AuthorizationServerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const AuthorizationServerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "authorizationserver-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8326,7 +8326,7 @@ export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper =
   }
 };
 
-export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
+export const BackendGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8342,7 +8342,7 @@ export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendGetHeaders: msRest.CompositeMapper = {
+export const BackendGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-get-headers",
   type: {
     name: "Composite",
@@ -8358,7 +8358,7 @@ export const BackendGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const BackendCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "backend-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8374,7 +8374,7 @@ export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CacheGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8390,7 +8390,7 @@ export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheGetHeaders: msRest.CompositeMapper = {
+export const CacheGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-get-headers",
   type: {
     name: "Composite",
@@ -8406,7 +8406,7 @@ export const CacheGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CacheCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "cache-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8422,7 +8422,7 @@ export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const CertificateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8438,7 +8438,7 @@ export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetHeaders: msRest.CompositeMapper = {
+export const CertificateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-get-headers",
   type: {
     name: "Composite",
@@ -8454,7 +8454,7 @@ export const CertificateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const CertificateCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "certificate-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8470,7 +8470,7 @@ export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8486,7 +8486,7 @@ export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticGetHeaders: msRest.CompositeMapper = {
+export const DiagnosticGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-get-headers",
   type: {
     name: "Composite",
@@ -8502,7 +8502,7 @@ export const DiagnosticGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const DiagnosticCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "diagnostic-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8518,7 +8518,7 @@ export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8534,7 +8534,7 @@ export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
+export const EmailTemplateGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "emailtemplate-get-headers",
   type: {
     name: "Composite",
@@ -8550,7 +8550,7 @@ export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
+export const GroupGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8566,7 +8566,7 @@ export const GroupGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupGetHeaders: msRest.CompositeMapper = {
+export const GroupGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-get-headers",
   type: {
     name: "Composite",
@@ -8582,7 +8582,7 @@ export const GroupGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const GroupCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "group-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8598,7 +8598,7 @@ export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8614,7 +8614,7 @@ export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
+export const IdentityProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-get-headers",
   type: {
     name: "Composite",
@@ -8630,7 +8630,7 @@ export const IdentityProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const IdentityProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "identityprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8646,7 +8646,7 @@ export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const IssueGetHeaders: msRest.CompositeMapper = {
+export const IssueGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "issue-get-headers",
   type: {
     name: "Composite",
@@ -8662,7 +8662,7 @@ export const IssueGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
+export const LoggerGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8678,7 +8678,7 @@ export const LoggerGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerGetHeaders: msRest.CompositeMapper = {
+export const LoggerGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-get-headers",
   type: {
     name: "Composite",
@@ -8694,7 +8694,7 @@ export const LoggerGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const LoggerCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "logger-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8710,7 +8710,7 @@ export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8726,7 +8726,7 @@ export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper =
   }
 };
 
-export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-get-headers",
   type: {
     name: "Composite",
@@ -8742,7 +8742,7 @@ export const OpenIdConnectProviderGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "openidconnectprovider-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8758,7 +8758,7 @@ export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper
   }
 };
 
-export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8774,7 +8774,7 @@ export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyGetHeaders: msRest.CompositeMapper = {
+export const PolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-get-headers",
   type: {
     name: "Composite",
@@ -8790,7 +8790,7 @@ export const PolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "policy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8806,7 +8806,7 @@ export const PolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8822,7 +8822,7 @@ export const SignInSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignInSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signinsettings-get-headers",
   type: {
     name: "Composite",
@@ -8838,7 +8838,7 @@ export const SignInSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8854,7 +8854,7 @@ export const SignUpSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
+export const SignUpSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "signupsettings-get-headers",
   type: {
     name: "Composite",
@@ -8870,7 +8870,7 @@ export const SignUpSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8886,7 +8886,7 @@ export const DelegationSettingsGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
+export const DelegationSettingsGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "delegationsettings-get-headers",
   type: {
     name: "Composite",
@@ -8902,7 +8902,7 @@ export const DelegationSettingsGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8918,7 +8918,7 @@ export const ProductGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductGetHeaders: msRest.CompositeMapper = {
+export const ProductGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-get-headers",
   type: {
     name: "Composite",
@@ -8934,7 +8934,7 @@ export const ProductGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "product-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8950,7 +8950,7 @@ export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-getentitytag-headers",
   type: {
     name: "Composite",
@@ -8966,7 +8966,7 @@ export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
+export const ProductPolicyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-get-headers",
   type: {
     name: "Composite",
@@ -8982,7 +8982,7 @@ export const ProductPolicyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const ProductPolicyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "productpolicy-createorupdate-headers",
   type: {
     name: "Composite",
@@ -8998,7 +8998,7 @@ export const ProductPolicyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystatebyproduct-headers",
   type: {
     name: "Composite",
@@ -9014,7 +9014,7 @@ export const TagGetEntityStateByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetByProductHeaders: msRest.CompositeMapper = {
+export const TagGetByProductHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getbyproduct-headers",
   type: {
     name: "Composite",
@@ -9030,7 +9030,7 @@ export const TagGetByProductHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
+export const PropertyGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9046,7 +9046,7 @@ export const PropertyGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyGetHeaders: msRest.CompositeMapper = {
+export const PropertyGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-get-headers",
   type: {
     name: "Composite",
@@ -9062,7 +9062,7 @@ export const PropertyGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const PropertyCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "property-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9078,7 +9078,7 @@ export const PropertyCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9094,7 +9094,7 @@ export const SubscriptionGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionGetHeaders: msRest.CompositeMapper = {
+export const SubscriptionGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-get-headers",
   type: {
     name: "Composite",
@@ -9110,7 +9110,7 @@ export const SubscriptionGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const SubscriptionCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "subscription-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9126,7 +9126,7 @@ export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
+export const TagGetEntityStateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-getentitystate-headers",
   type: {
     name: "Composite",
@@ -9142,7 +9142,7 @@ export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagGetHeaders: msRest.CompositeMapper = {
+export const TagGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-get-headers",
   type: {
     name: "Composite",
@@ -9158,7 +9158,7 @@ export const TagGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const TagCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "tag-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9174,7 +9174,7 @@ export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9190,7 +9190,7 @@ export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccess-get-headers",
   type: {
     name: "Composite",
@@ -9206,7 +9206,7 @@ export const TenantAccessGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
+export const TenantAccessGitGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "tenantaccessgit-get-headers",
   type: {
     name: "Composite",
@@ -9222,7 +9222,7 @@ export const TenantAccessGitGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
+export const UserGetEntityTagHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-getentitytag-headers",
   type: {
     name: "Composite",
@@ -9238,7 +9238,7 @@ export const UserGetEntityTagHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserGetHeaders: msRest.CompositeMapper = {
+export const UserGetHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-get-headers",
   type: {
     name: "Composite",
@@ -9254,7 +9254,7 @@ export const UserGetHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
+export const UserCreateOrUpdateHeaders: coreHttp.CompositeMapper = {
   serializedName: "user-createorupdate-headers",
   type: {
     name: "Composite",
@@ -9270,7 +9270,7 @@ export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const ApiCollection: msRest.CompositeMapper = {
+export const ApiCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiCollection",
   type: {
     name: "Composite",
@@ -9300,7 +9300,7 @@ export const ApiCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagResourceCollection: msRest.CompositeMapper = {
+export const TagResourceCollection: coreHttp.CompositeMapper = {
   serializedName: "TagResourceCollection",
   type: {
     name: "Composite",
@@ -9328,7 +9328,7 @@ export const TagResourceCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiRevisionCollection: msRest.CompositeMapper = {
+export const ApiRevisionCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiRevisionCollection",
   type: {
     name: "Composite",
@@ -9358,7 +9358,7 @@ export const ApiRevisionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiReleaseCollection: msRest.CompositeMapper = {
+export const ApiReleaseCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiReleaseCollection",
   type: {
     name: "Composite",
@@ -9388,7 +9388,7 @@ export const ApiReleaseCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationCollection: msRest.CompositeMapper = {
+export const OperationCollection: coreHttp.CompositeMapper = {
   serializedName: "OperationCollection",
   type: {
     name: "Composite",
@@ -9418,7 +9418,7 @@ export const OperationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagCollection: msRest.CompositeMapper = {
+export const TagCollection: coreHttp.CompositeMapper = {
   serializedName: "TagCollection",
   type: {
     name: "Composite",
@@ -9446,7 +9446,7 @@ export const TagCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ProductCollection: msRest.CompositeMapper = {
+export const ProductCollection: coreHttp.CompositeMapper = {
   serializedName: "ProductCollection",
   type: {
     name: "Composite",
@@ -9474,7 +9474,7 @@ export const ProductCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SchemaCollection: msRest.CompositeMapper = {
+export const SchemaCollection: coreHttp.CompositeMapper = {
   serializedName: "SchemaCollection",
   type: {
     name: "Composite",
@@ -9504,7 +9504,7 @@ export const SchemaCollection: msRest.CompositeMapper = {
   }
 };
 
-export const DiagnosticCollection: msRest.CompositeMapper = {
+export const DiagnosticCollection: coreHttp.CompositeMapper = {
   serializedName: "DiagnosticCollection",
   type: {
     name: "Composite",
@@ -9532,7 +9532,7 @@ export const DiagnosticCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCollection: msRest.CompositeMapper = {
+export const IssueCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCollection",
   type: {
     name: "Composite",
@@ -9562,7 +9562,7 @@ export const IssueCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueCommentCollection: msRest.CompositeMapper = {
+export const IssueCommentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueCommentCollection",
   type: {
     name: "Composite",
@@ -9592,7 +9592,7 @@ export const IssueCommentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IssueAttachmentCollection: msRest.CompositeMapper = {
+export const IssueAttachmentCollection: coreHttp.CompositeMapper = {
   serializedName: "IssueAttachmentCollection",
   type: {
     name: "Composite",
@@ -9622,7 +9622,7 @@ export const IssueAttachmentCollection: msRest.CompositeMapper = {
   }
 };
 
-export const TagDescriptionCollection: msRest.CompositeMapper = {
+export const TagDescriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "TagDescriptionCollection",
   type: {
     name: "Composite",
@@ -9650,7 +9650,7 @@ export const TagDescriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetCollection: msRest.CompositeMapper = {
+export const ApiVersionSetCollection: coreHttp.CompositeMapper = {
   serializedName: "ApiVersionSetCollection",
   type: {
     name: "Composite",
@@ -9678,7 +9678,7 @@ export const ApiVersionSetCollection: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerCollection: msRest.CompositeMapper = {
+export const AuthorizationServerCollection: coreHttp.CompositeMapper = {
   serializedName: "AuthorizationServerCollection",
   type: {
     name: "Composite",
@@ -9712,7 +9712,7 @@ export const AuthorizationServerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const BackendCollection: msRest.CompositeMapper = {
+export const BackendCollection: coreHttp.CompositeMapper = {
   serializedName: "BackendCollection",
   type: {
     name: "Composite",
@@ -9740,7 +9740,7 @@ export const BackendCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CacheCollection: msRest.CompositeMapper = {
+export const CacheCollection: coreHttp.CompositeMapper = {
   serializedName: "CacheCollection",
   type: {
     name: "Composite",
@@ -9768,7 +9768,7 @@ export const CacheCollection: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateCollection: msRest.CompositeMapper = {
+export const CertificateCollection: coreHttp.CompositeMapper = {
   serializedName: "CertificateCollection",
   type: {
     name: "Composite",
@@ -9796,7 +9796,7 @@ export const CertificateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OperationListResult: msRest.CompositeMapper = {
+export const OperationListResult: coreHttp.CompositeMapper = {
   serializedName: "OperationListResult",
   type: {
     name: "Composite",
@@ -9824,7 +9824,7 @@ export const OperationListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResults: msRest.CompositeMapper = {
+export const ResourceSkuResults: coreHttp.CompositeMapper = {
   serializedName: "ResourceSkuResults",
   type: {
     name: "Composite",
@@ -9853,7 +9853,7 @@ export const ResourceSkuResults: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceListResult: msRest.CompositeMapper = {
+export const ApiManagementServiceListResult: coreHttp.CompositeMapper = {
   serializedName: "ApiManagementServiceListResult",
   type: {
     name: "Composite",
@@ -9882,7 +9882,7 @@ export const ApiManagementServiceListResult: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateCollection: msRest.CompositeMapper = {
+export const EmailTemplateCollection: coreHttp.CompositeMapper = {
   serializedName: "EmailTemplateCollection",
   type: {
     name: "Composite",
@@ -9910,7 +9910,7 @@ export const EmailTemplateCollection: msRest.CompositeMapper = {
   }
 };
 
-export const GroupCollection: msRest.CompositeMapper = {
+export const GroupCollection: coreHttp.CompositeMapper = {
   serializedName: "GroupCollection",
   type: {
     name: "Composite",
@@ -9938,7 +9938,7 @@ export const GroupCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserCollection: msRest.CompositeMapper = {
+export const UserCollection: coreHttp.CompositeMapper = {
   serializedName: "UserCollection",
   type: {
     name: "Composite",
@@ -9966,7 +9966,7 @@ export const UserCollection: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderList: msRest.CompositeMapper = {
+export const IdentityProviderList: coreHttp.CompositeMapper = {
   serializedName: "IdentityProviderList",
   type: {
     name: "Composite",
@@ -9994,7 +9994,7 @@ export const IdentityProviderList: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerCollection: msRest.CompositeMapper = {
+export const LoggerCollection: coreHttp.CompositeMapper = {
   serializedName: "LoggerCollection",
   type: {
     name: "Composite",
@@ -10028,7 +10028,7 @@ export const LoggerCollection: msRest.CompositeMapper = {
   }
 };
 
-export const NotificationCollection: msRest.CompositeMapper = {
+export const NotificationCollection: coreHttp.CompositeMapper = {
   serializedName: "NotificationCollection",
   type: {
     name: "Composite",
@@ -10056,7 +10056,7 @@ export const NotificationCollection: msRest.CompositeMapper = {
   }
 };
 
-export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
+export const OpenIdConnectProviderCollection: coreHttp.CompositeMapper = {
   serializedName: "OpenIdConnectProviderCollection",
   type: {
     name: "Composite",
@@ -10084,7 +10084,7 @@ export const OpenIdConnectProviderCollection: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCollection: msRest.CompositeMapper = {
+export const SubscriptionCollection: coreHttp.CompositeMapper = {
   serializedName: "SubscriptionCollection",
   type: {
     name: "Composite",
@@ -10112,7 +10112,7 @@ export const SubscriptionCollection: msRest.CompositeMapper = {
   }
 };
 
-export const PropertyCollection: msRest.CompositeMapper = {
+export const PropertyCollection: coreHttp.CompositeMapper = {
   serializedName: "PropertyCollection",
   type: {
     name: "Composite",
@@ -10140,7 +10140,7 @@ export const PropertyCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RegionListResult: msRest.CompositeMapper = {
+export const RegionListResult: coreHttp.CompositeMapper = {
   serializedName: "RegionListResult",
   type: {
     name: "Composite",
@@ -10174,7 +10174,7 @@ export const RegionListResult: msRest.CompositeMapper = {
   }
 };
 
-export const ReportCollection: msRest.CompositeMapper = {
+export const ReportCollection: coreHttp.CompositeMapper = {
   serializedName: "ReportCollection",
   type: {
     name: "Composite",
@@ -10208,7 +10208,7 @@ export const ReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const RequestReportCollection: msRest.CompositeMapper = {
+export const RequestReportCollection: coreHttp.CompositeMapper = {
   serializedName: "RequestReportCollection",
   type: {
     name: "Composite",
@@ -10236,7 +10236,7 @@ export const RequestReportCollection: msRest.CompositeMapper = {
   }
 };
 
-export const UserIdentityCollection: msRest.CompositeMapper = {
+export const UserIdentityCollection: coreHttp.CompositeMapper = {
   serializedName: "UserIdentityCollection",
   type: {
     name: "Composite",
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index b300ade09092..d21da1dce55a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
@@ -8,9 +8,9 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 
-export const acceptLanguage: msRest.OperationParameter = {
+export const acceptLanguage: coreHttp.OperationParameter = {
   parameterPath: "acceptLanguage",
   mapper: {
     serializedName: "accept-language",
@@ -20,7 +20,7 @@ export const acceptLanguage: msRest.OperationParameter = {
     }
   }
 };
-export const accessName: msRest.OperationURLParameter = {
+export const accessName: coreHttp.OperationURLParameter = {
   parameterPath: "accessName",
   mapper: {
     required: true,
@@ -32,7 +32,7 @@ export const accessName: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId0: msRest.OperationURLParameter = {
+export const apiId0: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
@@ -47,22 +47,21 @@ export const apiId0: msRest.OperationURLParameter = {
     }
   }
 };
-export const apiId1: msRest.OperationURLParameter = {
+export const apiId1: coreHttp.OperationURLParameter = {
   parameterPath: "apiId",
   mapper: {
     required: true,
     serializedName: "apiId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const apiVersion: msRest.OperationQueryParameter = {
+export const apiVersion: coreHttp.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
@@ -72,7 +71,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
     }
   }
 };
-export const attachmentId: msRest.OperationURLParameter = {
+export const attachmentId: coreHttp.OperationURLParameter = {
   parameterPath: "attachmentId",
   mapper: {
     required: true,
@@ -87,7 +86,7 @@ export const attachmentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const authsid: msRest.OperationURLParameter = {
+export const authsid: coreHttp.OperationURLParameter = {
   parameterPath: "authsid",
   mapper: {
     required: true,
@@ -102,22 +101,21 @@ export const authsid: msRest.OperationURLParameter = {
     }
   }
 };
-export const backendId: msRest.OperationURLParameter = {
+export const backendId: coreHttp.OperationURLParameter = {
   parameterPath: "backendId",
   mapper: {
     required: true,
     serializedName: "backendId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const cacheId: msRest.OperationURLParameter = {
+export const cacheId: coreHttp.OperationURLParameter = {
   parameterPath: "cacheId",
   mapper: {
     required: true,
@@ -132,7 +130,7 @@ export const cacheId: msRest.OperationURLParameter = {
     }
   }
 };
-export const certificateId: msRest.OperationURLParameter = {
+export const certificateId: coreHttp.OperationURLParameter = {
   parameterPath: "certificateId",
   mapper: {
     required: true,
@@ -147,7 +145,7 @@ export const certificateId: msRest.OperationURLParameter = {
     }
   }
 };
-export const commentId: msRest.OperationURLParameter = {
+export const commentId: coreHttp.OperationURLParameter = {
   parameterPath: "commentId",
   mapper: {
     required: true,
@@ -162,7 +160,7 @@ export const commentId: msRest.OperationURLParameter = {
     }
   }
 };
-export const configurationName: msRest.OperationURLParameter = {
+export const configurationName: coreHttp.OperationURLParameter = {
   parameterPath: "configurationName",
   mapper: {
     required: true,
@@ -174,7 +172,7 @@ export const configurationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const deleteRevisions: msRest.OperationQueryParameter = {
+export const deleteRevisions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteRevisions"
@@ -186,7 +184,7 @@ export const deleteRevisions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const deleteSubscriptions: msRest.OperationQueryParameter = {
+export const deleteSubscriptions: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "deleteSubscriptions"
@@ -198,7 +196,7 @@ export const deleteSubscriptions: msRest.OperationQueryParameter = {
     }
   }
 };
-export const diagnosticId: msRest.OperationURLParameter = {
+export const diagnosticId: coreHttp.OperationURLParameter = {
   parameterPath: "diagnosticId",
   mapper: {
     required: true,
@@ -213,7 +211,7 @@ export const diagnosticId: msRest.OperationURLParameter = {
     }
   }
 };
-export const email: msRest.OperationURLParameter = {
+export const email: coreHttp.OperationURLParameter = {
   parameterPath: "email",
   mapper: {
     required: true,
@@ -223,7 +221,7 @@ export const email: msRest.OperationURLParameter = {
     }
   }
 };
-export const expandApiVersionSet: msRest.OperationQueryParameter = {
+export const expandApiVersionSet: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandApiVersionSet"
@@ -235,7 +233,7 @@ export const expandApiVersionSet: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandCommentsAttachments: msRest.OperationQueryParameter = {
+export const expandCommentsAttachments: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandCommentsAttachments"
@@ -247,7 +245,7 @@ export const expandCommentsAttachments: msRest.OperationQueryParameter = {
     }
   }
 };
-export const expandGroups: msRest.OperationQueryParameter = {
+export const expandGroups: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "expandGroups"
@@ -259,7 +257,7 @@ export const expandGroups: msRest.OperationQueryParameter = {
     }
   }
 };
-export const exportParameter: msRest.OperationQueryParameter = {
+export const exportParameter: coreHttp.OperationQueryParameter = {
   parameterPath: "exportParameter",
   mapper: {
     required: true,
@@ -271,7 +269,7 @@ export const exportParameter: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter0: msRest.OperationQueryParameter = {
+export const filter0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "filter"
@@ -283,7 +281,7 @@ export const filter0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const filter1: msRest.OperationQueryParameter = {
+export const filter1: coreHttp.OperationQueryParameter = {
   parameterPath: "filter",
   mapper: {
     required: true,
@@ -293,7 +291,7 @@ export const filter1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const force: msRest.OperationQueryParameter = {
+export const force: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "force"
@@ -305,7 +303,7 @@ export const force: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format0: msRest.OperationQueryParameter = {
+export const format0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "format"
@@ -318,7 +316,7 @@ export const format0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const format1: msRest.OperationQueryParameter = {
+export const format1: coreHttp.OperationQueryParameter = {
   parameterPath: "format",
   mapper: {
     required: true,
@@ -328,22 +326,21 @@ export const format1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const groupId: msRest.OperationURLParameter = {
+export const groupId: coreHttp.OperationURLParameter = {
   parameterPath: "groupId",
   mapper: {
     required: true,
     serializedName: "groupId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const identityProviderName: msRest.OperationURLParameter = {
+export const identityProviderName: coreHttp.OperationURLParameter = {
   parameterPath: "identityProviderName",
   mapper: {
     required: true,
@@ -353,7 +350,7 @@ export const identityProviderName: msRest.OperationURLParameter = {
     }
   }
 };
-export const ifMatch0: msRest.OperationParameter = {
+export const ifMatch0: coreHttp.OperationParameter = {
   parameterPath: [
     "options",
     "ifMatch"
@@ -365,7 +362,7 @@ export const ifMatch0: msRest.OperationParameter = {
     }
   }
 };
-export const ifMatch1: msRest.OperationParameter = {
+export const ifMatch1: coreHttp.OperationParameter = {
   parameterPath: "ifMatch",
   mapper: {
     required: true,
@@ -375,7 +372,7 @@ export const ifMatch1: msRest.OperationParameter = {
     }
   }
 };
-export const includeNotTaggedApis: msRest.OperationQueryParameter = {
+export const includeNotTaggedApis: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedApis"
@@ -387,7 +384,7 @@ export const includeNotTaggedApis: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
+export const includeNotTaggedOperations: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedOperations"
@@ -399,7 +396,7 @@ export const includeNotTaggedOperations: msRest.OperationQueryParameter = {
     }
   }
 };
-export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
+export const includeNotTaggedProducts: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "includeNotTaggedProducts"
@@ -411,7 +408,7 @@ export const includeNotTaggedProducts: msRest.OperationQueryParameter = {
     }
   }
 };
-export const interval: msRest.OperationQueryParameter = {
+export const interval: coreHttp.OperationQueryParameter = {
   parameterPath: "interval",
   mapper: {
     required: true,
@@ -421,7 +418,7 @@ export const interval: msRest.OperationQueryParameter = {
     }
   }
 };
-export const issueId: msRest.OperationURLParameter = {
+export const issueId: coreHttp.OperationURLParameter = {
   parameterPath: "issueId",
   mapper: {
     required: true,
@@ -436,7 +433,7 @@ export const issueId: msRest.OperationURLParameter = {
     }
   }
 };
-export const locationName: msRest.OperationURLParameter = {
+export const locationName: coreHttp.OperationURLParameter = {
   parameterPath: "locationName",
   mapper: {
     required: true,
@@ -449,7 +446,7 @@ export const locationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const loggerId: msRest.OperationURLParameter = {
+export const loggerId: coreHttp.OperationURLParameter = {
   parameterPath: "loggerId",
   mapper: {
     required: true,
@@ -463,7 +460,7 @@ export const loggerId: msRest.OperationURLParameter = {
     }
   }
 };
-export const nextPageLink: msRest.OperationURLParameter = {
+export const nextPageLink: coreHttp.OperationURLParameter = {
   parameterPath: "nextPageLink",
   mapper: {
     required: true,
@@ -474,7 +471,7 @@ export const nextPageLink: msRest.OperationURLParameter = {
   },
   skipEncoding: true
 };
-export const notificationName: msRest.OperationURLParameter = {
+export const notificationName: coreHttp.OperationURLParameter = {
   parameterPath: "notificationName",
   mapper: {
     required: true,
@@ -484,7 +481,7 @@ export const notificationName: msRest.OperationURLParameter = {
     }
   }
 };
-export const notify: msRest.OperationQueryParameter = {
+export const notify: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "notify"
@@ -496,22 +493,21 @@ export const notify: msRest.OperationQueryParameter = {
     }
   }
 };
-export const operationId: msRest.OperationURLParameter = {
+export const operationId: coreHttp.OperationURLParameter = {
   parameterPath: "operationId",
   mapper: {
     required: true,
     serializedName: "operationId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const opid: msRest.OperationURLParameter = {
+export const opid: coreHttp.OperationURLParameter = {
   parameterPath: "opid",
   mapper: {
     required: true,
@@ -525,7 +521,7 @@ export const opid: msRest.OperationURLParameter = {
     }
   }
 };
-export const orderby: msRest.OperationQueryParameter = {
+export const orderby: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "orderby"
@@ -537,7 +533,7 @@ export const orderby: msRest.OperationQueryParameter = {
     }
   }
 };
-export const policyId: msRest.OperationURLParameter = {
+export const policyId: coreHttp.OperationURLParameter = {
   parameterPath: "policyId",
   mapper: {
     required: true,
@@ -549,22 +545,21 @@ export const policyId: msRest.OperationURLParameter = {
     }
   }
 };
-export const productId: msRest.OperationURLParameter = {
+export const productId: coreHttp.OperationURLParameter = {
   parameterPath: "productId",
   mapper: {
     required: true,
     serializedName: "productId",
     constraints: {
       MaxLength: 256,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const propId: msRest.OperationURLParameter = {
+export const propId: coreHttp.OperationURLParameter = {
   parameterPath: "propId",
   mapper: {
     required: true,
@@ -578,7 +573,7 @@ export const propId: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaCounterKey: msRest.OperationURLParameter = {
+export const quotaCounterKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaCounterKey",
   mapper: {
     required: true,
@@ -588,7 +583,7 @@ export const quotaCounterKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const quotaPeriodKey: msRest.OperationURLParameter = {
+export const quotaPeriodKey: coreHttp.OperationURLParameter = {
   parameterPath: "quotaPeriodKey",
   mapper: {
     required: true,
@@ -598,7 +593,7 @@ export const quotaPeriodKey: msRest.OperationURLParameter = {
     }
   }
 };
-export const releaseId: msRest.OperationURLParameter = {
+export const releaseId: coreHttp.OperationURLParameter = {
   parameterPath: "releaseId",
   mapper: {
     required: true,
@@ -613,7 +608,7 @@ export const releaseId: msRest.OperationURLParameter = {
     }
   }
 };
-export const resourceGroupName: msRest.OperationURLParameter = {
+export const resourceGroupName: coreHttp.OperationURLParameter = {
   parameterPath: "resourceGroupName",
   mapper: {
     required: true,
@@ -623,7 +618,7 @@ export const resourceGroupName: msRest.OperationURLParameter = {
     }
   }
 };
-export const schemaId: msRest.OperationURLParameter = {
+export const schemaId: coreHttp.OperationURLParameter = {
   parameterPath: "schemaId",
   mapper: {
     required: true,
@@ -638,7 +633,7 @@ export const schemaId: msRest.OperationURLParameter = {
     }
   }
 };
-export const scope0: msRest.OperationQueryParameter = {
+export const scope0: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -650,7 +645,7 @@ export const scope0: msRest.OperationQueryParameter = {
     }
   }
 };
-export const scope1: msRest.OperationQueryParameter = {
+export const scope1: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "scope"
@@ -669,7 +664,7 @@ export const scope1: msRest.OperationQueryParameter = {
     }
   }
 };
-export const serviceName: msRest.OperationURLParameter = {
+export const serviceName: coreHttp.OperationURLParameter = {
   parameterPath: "serviceName",
   mapper: {
     required: true,
@@ -684,7 +679,7 @@ export const serviceName: msRest.OperationURLParameter = {
     }
   }
 };
-export const sid: msRest.OperationURLParameter = {
+export const sid: coreHttp.OperationURLParameter = {
   parameterPath: "sid",
   mapper: {
     required: true,
@@ -698,7 +693,7 @@ export const sid: msRest.OperationURLParameter = {
     }
   }
 };
-export const skip: msRest.OperationQueryParameter = {
+export const skip: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "skip"
@@ -713,7 +708,7 @@ export const skip: msRest.OperationQueryParameter = {
     }
   }
 };
-export const subscriptionId: msRest.OperationURLParameter = {
+export const subscriptionId: coreHttp.OperationURLParameter = {
   parameterPath: "subscriptionId",
   mapper: {
     required: true,
@@ -723,7 +718,7 @@ export const subscriptionId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tagId: msRest.OperationURLParameter = {
+export const tagId: coreHttp.OperationURLParameter = {
   parameterPath: "tagId",
   mapper: {
     required: true,
@@ -738,7 +733,7 @@ export const tagId: msRest.OperationURLParameter = {
     }
   }
 };
-export const tags: msRest.OperationQueryParameter = {
+export const tags: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "tags"
@@ -750,7 +745,7 @@ export const tags: msRest.OperationQueryParameter = {
     }
   }
 };
-export const templateName: msRest.OperationURLParameter = {
+export const templateName: coreHttp.OperationURLParameter = {
   parameterPath: "templateName",
   mapper: {
     required: true,
@@ -760,7 +755,7 @@ export const templateName: msRest.OperationURLParameter = {
     }
   }
 };
-export const top: msRest.OperationQueryParameter = {
+export const top: coreHttp.OperationQueryParameter = {
   parameterPath: [
     "options",
     "top"
@@ -775,22 +770,21 @@ export const top: msRest.OperationQueryParameter = {
     }
   }
 };
-export const userId: msRest.OperationURLParameter = {
+export const userId: coreHttp.OperationURLParameter = {
   parameterPath: "userId",
   mapper: {
     required: true,
     serializedName: "userId",
     constraints: {
       MaxLength: 80,
-      MinLength: 1,
-      Pattern: /^[^*#&+:<>?]+$/
+      MinLength: 1
     },
     type: {
       name: "String"
     }
   }
 };
-export const versionSetId: msRest.OperationURLParameter = {
+export const versionSetId: coreHttp.OperationURLParameter = {
   parameterPath: "versionSetId",
   mapper: {
     required: true,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..62893a65e480 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiMappers";
 import * as Parameters from "../models/parameters";
@@ -40,15 +40,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,9 +162,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -175,7 +175,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -211,9 +211,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -223,7 +223,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,15 +261,15 @@ export class Api {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,9 +288,9 @@ export class Api {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param parameters Create or update parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiBeginCreateOrUpdateOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -337,19 +337,19 @@ export class Api {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -361,8 +361,8 @@ export class Api {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis",
   urlParameters: [
@@ -392,7 +392,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -445,7 +445,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -477,7 +477,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -504,7 +504,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apisByTags",
   urlParameters: [
@@ -533,7 +533,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
@@ -575,7 +575,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -596,7 +596,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
index aac5ab05ff5e..e4834d6ce0c4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiDiagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiDiagnostic {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -72,7 +72,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,7 +81,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -115,7 +115,7 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,7 +124,7 @@ export class ApiDiagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -134,8 +134,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ export class ApiDiagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -206,9 +206,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -220,7 +220,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -233,8 +233,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -259,9 +259,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -272,7 +272,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -305,19 +305,19 @@ export class ApiDiagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiDiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiDiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -329,8 +329,8 @@ export class ApiDiagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics",
   urlParameters: [
@@ -359,7 +359,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -414,7 +414,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -454,7 +454,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -487,7 +487,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -514,7 +514,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
index eccbf4429a22..9ea84a86b30c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiExport.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiExportMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiExport {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiExportGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiExportGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class ApiExport {
    * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'Openapi'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class ApiExport {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiExportResult>, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiExportResult>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiExportResult>, callback?: coreHttp.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -75,8 +75,8 @@ export class ApiExport {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..527626919d80 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiIssue {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiIssue {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueGetOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueGetOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,7 +161,7 @@ export class ApiIssue {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -171,8 +171,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -196,9 +196,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -209,7 +209,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -221,8 +221,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,9 +246,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -258,7 +258,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -269,8 +269,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -290,19 +290,19 @@ export class ApiIssue {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -314,8 +314,8 @@ export class ApiIssue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues",
   urlParameters: [
@@ -345,7 +345,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -401,7 +401,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -474,7 +474,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}",
   urlParameters: [
@@ -501,7 +501,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
index 9392f644c44d..d4098f4441ba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueAttachmentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueAttachment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueAttachment {
    * @param attachmentId Attachment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueAttachment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueAttachmentContract>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueAttachment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueAttachment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueAttachment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueAttachment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueAttachmentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueAttachmentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueAttachmentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueAttachment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/attachments/{attachmentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
index 8f4584a711ee..9938dad7fa57 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiIssueCommentMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiIssueComment {
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -77,7 +77,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,8 +96,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,7 +130,7 @@ export class ApiIssueComment {
    * @param commentId Comment identifier within an Issue. Must be unique in the current Issue.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -140,8 +140,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -176,7 +176,7 @@ export class ApiIssueComment {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCommentContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IssueCommentContract>, callback?: coreHttp.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -213,9 +213,9 @@ export class ApiIssueComment {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -226,7 +226,7 @@ export class ApiIssueComment {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -238,8 +238,8 @@ export class ApiIssueComment {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -260,19 +260,19 @@ export class ApiIssueComment {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiIssueCommentListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiIssueCommentListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCommentCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCommentCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -284,8 +284,8 @@ export class ApiIssueComment {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments",
   urlParameters: [
@@ -315,7 +315,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -343,7 +343,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -413,7 +413,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/issues/{issueId}/comments/{commentId}",
   urlParameters: [
@@ -441,7 +441,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
index 043449470e76..4b4a2370c112 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -31,17 +31,17 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -56,19 +56,19 @@ export class ApiManagementOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementOperationsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementOperationsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationListResult>, callback?: coreHttp.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -80,8 +80,8 @@ export class ApiManagementOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "providers/Microsoft.ApiManagement/operations",
   queryParameters: [
@@ -101,7 +101,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
index e098f991f33b..4def1deb0c6a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementService.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceRestoreResponse>
    */
-  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
+  restore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceRestoreResponse> {
     return this.beginRestore(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceRestoreResponse>;
   }
@@ -52,7 +52,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceBackupResponse>
    */
-  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
+  backup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceBackupResponse> {
     return this.beginBackup(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceBackupResponse>;
   }
@@ -66,7 +66,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCreateOrUpdateResponse> {
     return this.beginCreateOrUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceCreateOrUpdateResponse>;
   }
@@ -79,7 +79,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceUpdateResponse> {
     return this.beginUpdate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceUpdateResponse>;
   }
@@ -91,21 +91,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceResource>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceResource>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -123,7 +123,7 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceDeleteMethodResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceDeleteMethodResponse> {
     return this.beginDeleteMethod(resourceGroupName,serviceName,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.ApiManagementServiceDeleteMethodResponse>;
   }
@@ -134,19 +134,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupResponse>
    */
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
+  listByResourceGroup(resourceGroupName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroup(resourceGroupName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -161,17 +161,17 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListResponse>
    */
-  list(options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
+  list(options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListResponse>;
   /**
    * @param callback The callback
    */
-  list(callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
+  list(options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  list(options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -187,21 +187,21 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceGetSsoTokenResponse>
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceGetSsoTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSsoToken(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
+  getSsoToken(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,19 +218,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse>;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
   /**
    * @param parameters Parameters supplied to the CheckNameAvailability operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
     return this.client.sendOperationRequest(
       {
         parameters,
@@ -262,9 +262,9 @@ export class ApiManagementService {
    * @param parameters Parameters supplied to the Restore API Management service from backup
    * operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginRestore(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the ApiManagementService_Backup operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginBackup(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceBackupRestoreParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -304,9 +304,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginCreateOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceResource, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -324,9 +324,9 @@ export class ApiManagementService {
    * @param serviceName The name of the API Management service.
    * @param parameters Parameters supplied to the CreateOrUpdate API Management service operation.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginUpdate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUpdateParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -343,9 +343,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeleteMethod(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -362,9 +362,9 @@ export class ApiManagementService {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<msRestAzure.LROPoller> {
+  beginApplyNetworkConfigurationUpdates(resourceGroupName: string, serviceName: string, options?: Models.ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOptionalParams): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -381,19 +381,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>
    */
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
+  listByResourceGroupNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listByResourceGroupNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -409,19 +409,19 @@ export class ApiManagementService {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: coreHttp.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -433,8 +433,8 @@ export class ApiManagementService {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -459,7 +459,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByResourceGroupOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -483,7 +483,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listOperationSpec: msRest.OperationSpec = {
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/service",
   urlParameters: [
@@ -506,7 +506,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSsoTokenOperationSpec: msRest.OperationSpec = {
+const getSsoTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/getssotoken",
   urlParameters: [
@@ -531,7 +531,7 @@ const getSsoTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
+const checkNameAvailabilityOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/checkNameAvailability",
   urlParameters: [
@@ -561,7 +561,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginRestoreOperationSpec: msRest.OperationSpec = {
+const beginRestoreOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore",
   urlParameters: [
@@ -594,7 +594,7 @@ const beginRestoreOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginBackupOperationSpec: msRest.OperationSpec = {
+const beginBackupOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup",
   urlParameters: [
@@ -627,7 +627,7 @@ const beginBackupOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
+const beginCreateOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -663,7 +663,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginUpdateOperationSpec: msRest.OperationSpec = {
+const beginUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -696,7 +696,7 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
+const beginDeleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
   urlParameters: [
@@ -723,7 +723,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec = {
+const beginApplyNetworkConfigurationUpdatesOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/applynetworkconfigurationupdates",
   urlParameters: [
@@ -756,7 +756,7 @@ const beginApplyNetworkConfigurationUpdatesOperationSpec: msRest.OperationSpec =
   serializer
 };
 
-const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
+const listByResourceGroupNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -777,7 +777,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
index 4ed93c82e480..4df1cfc2e754 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiManagementServiceSkus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiManagementServiceSkusMappers";
 import * as Parameters from "../models/parameters";
@@ -34,21 +34,21 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkus(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,19 +66,19 @@ export class ApiManagementServiceSkus {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServiceSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ResourceSkuResults>): void;
-  listAvailableServiceSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ResourceSkuResults>, callback?: msRest.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
+  listAvailableServiceSkusNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ResourceSkuResults>): void;
+  listAvailableServiceSkusNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ResourceSkuResults>, callback?: coreHttp.ServiceCallback<Models.ResourceSkuResults>): Promise<Models.ApiManagementServiceSkusListAvailableServiceSkusNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -90,8 +90,8 @@ export class ApiManagementServiceSkus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listAvailableServiceSkusOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/skus",
   urlParameters: [
@@ -116,7 +116,7 @@ const listAvailableServiceSkusOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listAvailableServiceSkusNextOperationSpec: msRest.OperationSpec = {
+const listAvailableServiceSkusNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
index 02d3a4495eeb..ddffaedd4f02 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiOperation {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiOperation {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiOperation {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OperationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OperationContract>, callback?: coreHttp.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,9 +219,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,7 +234,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -248,8 +248,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -275,9 +275,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -289,7 +289,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -323,19 +323,19 @@ export class ApiOperation {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OperationCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OperationCollection>, callback?: coreHttp.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -347,8 +347,8 @@ export class ApiOperation {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations",
   urlParameters: [
@@ -378,7 +378,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -433,7 +433,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -473,7 +473,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -506,7 +506,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}",
   urlParameters: [
@@ -533,7 +533,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
index 7e7f6bd110f5..d88c547584b8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiOperationPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyListByOperationResponse>
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyListByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class ApiOperationPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiOperationPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiOperationPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,7 +93,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -104,8 +104,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class ApiOperationPolicy {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -150,8 +150,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.ApiOperationPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.ApiOperationPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -187,7 +187,7 @@ export class ApiOperationPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -199,8 +199,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class ApiOperationPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -239,7 +239,7 @@ export class ApiOperationPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -252,8 +252,8 @@ export class ApiOperationPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,8 +269,8 @@ export class ApiOperationPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies",
   urlParameters: [
@@ -297,7 +297,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -325,7 +325,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -355,7 +355,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
@@ -396,7 +396,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
index 4d5ddbc68485..bf30180cb129 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyListByApiResponse>
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyListByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ApiPolicy {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ApiPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ApiPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ApiPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ApiPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ApiPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
index 10e07fb486f2..4c89bf24cdf0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiProduct.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiProductMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiProduct {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiProduct {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiProduct {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiProductListByApisNextResponse>
    */
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiProductListByApisNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApisNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
+  listByApisNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByApisNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiProduct {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApisOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApisOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/products",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByApisOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApisNextOperationSpec: msRest.OperationSpec = {
+const listByApisNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
index f0d3cedeb6d3..5b56128c5d1a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiReleaseMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiRelease {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -51,8 +51,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -83,7 +83,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -93,8 +93,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -126,7 +126,7 @@ export class ApiRelease {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -136,8 +136,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,7 +171,7 @@ export class ApiRelease {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -182,8 +182,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: Models.ApiReleaseCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiReleaseContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: Models.ApiReleaseCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiReleaseContract>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -208,9 +208,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -235,8 +235,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,9 +261,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -274,7 +274,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -309,19 +309,19 @@ export class ApiRelease {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiReleaseListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiReleaseListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiReleaseCollection>, callback?: coreHttp.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -333,8 +333,8 @@ export class ApiRelease {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases",
   urlParameters: [
@@ -363,7 +363,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -390,7 +390,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -418,7 +418,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -491,7 +491,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/releases/{releaseId}",
   urlParameters: [
@@ -518,7 +518,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
index 837ccbc609f9..7aefdbed97bf 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRevision.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiRevisionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class ApiRevision {
    * @param apiId API identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class ApiRevision {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class ApiRevision {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiRevisionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiRevisionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiRevisionCollection>, callback?: coreHttp.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class ApiRevision {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/revisions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
index da91eb979f4d..5ec72748bd7f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiSchemaMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ApiSchema {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiSchemaListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiSchemaListByApiOptionalParams | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ApiSchema {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -180,7 +180,7 @@ export class ApiSchema {
    * @param parameters The schema contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,8 +192,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SchemaContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaCreateOrUpdateContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SchemaContract>, callback?: coreHttp.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -218,9 +218,9 @@ export class ApiSchema {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -232,7 +232,7 @@ export class ApiSchema {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,8 +245,8 @@ export class ApiSchema {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: Models.ApiSchemaDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: Models.ApiSchemaDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class ApiSchema {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiSchemaListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiSchemaListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SchemaCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SchemaCollection>, callback?: coreHttp.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class ApiSchema {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas",
   urlParameters: [
@@ -320,7 +320,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -347,7 +347,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -375,7 +375,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -415,7 +415,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/schemas/{schemaId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
index dd13e851c706..7a81f3426756 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiTagDescriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -44,7 +44,7 @@ export class ApiTagDescription {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -53,8 +53,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiTagDescriptionListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiTagDescriptionListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,7 +85,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,8 +95,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiTagDescriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,7 +128,7 @@ export class ApiTagDescription {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -138,8 +138,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ApiTagDescription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -184,8 +184,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.ApiTagDescriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagDescriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.ApiTagDescriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagDescriptionContract>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.ApiTagDescriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,9 +209,9 @@ export class ApiTagDescription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiTagDescription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,8 +234,8 @@ export class ApiTagDescription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -256,19 +256,19 @@ export class ApiTagDescription {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiTagDescriptionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiTagDescriptionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagDescriptionCollection>, callback?: coreHttp.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.ApiTagDescriptionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -280,8 +280,8 @@ export class ApiTagDescription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions",
   urlParameters: [
@@ -310,7 +310,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -365,7 +365,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -405,7 +405,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tagDescriptions/{tagId}",
   urlParameters: [
@@ -432,7 +432,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
index 5f6861172541..b1c965b849a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/apiVersionSetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class ApiVersionSet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class ApiVersionSet {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class ApiVersionSet {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ApiVersionSetContract>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class ApiVersionSet {
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiVersionSetListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ApiVersionSetListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiVersionSetCollection>, callback?: coreHttp.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class ApiVersionSet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apiVersionSets/{versionSetId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 8a3182d35653..26d8f5932dac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/authorizationServerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class AuthorizationServer {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, authsid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class AuthorizationServer {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.AuthorizationServerContract>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class AuthorizationServer {
    * @param [options] The optional parameters
    * @returns Promise<Models.AuthorizationServerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.AuthorizationServerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AuthorizationServerCollection>, callback?: coreHttp.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class AuthorizationServer {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/authorizationServers/{authsid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..eb5e19210589 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/backendMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Backend {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendGetResponse>;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, backendId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  get(resourceGroupName: string, serviceName: string, backendId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
+  get(resourceGroupName: string, serviceName: string, backendId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  get(resourceGroupName: string, serviceName: string, backendId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Backend {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.BackendContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.BackendContract>, callback?: coreHttp.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, backendId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Backend {
    * @param backendId Identifier of the Backend entity. Must be unique in the current API Management
    * service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<msRest.RestResponse>;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Backend {
    * service instance.
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: msRest.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options: Models.BackendReconnectOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  reconnect(resourceGroupName: string, serviceName: string, backendId: string, options?: Models.BackendReconnectOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,19 +321,19 @@ export class Backend {
    * @param [options] The optional parameters
    * @returns Promise<Models.BackendListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.BackendListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.BackendCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.BackendCollection>, callback?: coreHttp.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -345,8 +345,8 @@ export class Backend {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends",
   urlParameters: [
@@ -374,7 +374,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -400,7 +400,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -427,7 +427,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -466,7 +466,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -498,7 +498,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}",
   urlParameters: [
@@ -524,7 +524,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const reconnectOperationSpec: msRest.OperationSpec = {
+const reconnectOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backends/{backendId}/reconnect",
   urlParameters: [
@@ -555,7 +555,7 @@ const reconnectOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..0229ff2d39ac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/cacheMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Cache {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CacheListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CacheListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CacheGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheGetResponse>;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Cache {
    * valid Azure region identifier).
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  get(resourceGroupName: string, serviceName: string, cacheId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Cache {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CacheContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options: Models.CacheCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CacheContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheContract, options?: Models.CacheCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CacheContract>, callback?: coreHttp.ServiceCallback<Models.CacheContract>): Promise<Models.CacheCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, cacheId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Cache {
    * @param [options] The optional parameters
    * @returns Promise<Models.CacheListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CacheListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheCollection>, callback?: msRest.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CacheCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CacheCollection>, callback?: coreHttp.ServiceCallback<Models.CacheCollection>): Promise<Models.CacheListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Cache {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches",
   urlParameters: [
@@ -333,7 +333,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -359,7 +359,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -386,7 +386,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -425,7 +425,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -457,7 +457,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}",
   urlParameters: [
@@ -483,7 +483,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
index f47a28ce34f4..2cee16d8e3fe 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/certificateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Certificate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Certificate {
    * Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Certificate {
    * @param parameters Create or Update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.CertificateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.CertificateContract>, callback?: coreHttp.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,9 +188,9 @@ export class Certificate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -200,7 +200,7 @@ export class Certificate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -211,8 +211,8 @@ export class Certificate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -231,19 +231,19 @@ export class Certificate {
    * @param [options] The optional parameters
    * @returns Promise<Models.CertificateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.CertificateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.CertificateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.CertificateCollection>, callback?: coreHttp.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -255,8 +255,8 @@ export class Certificate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates",
   urlParameters: [
@@ -284,7 +284,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -310,7 +310,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -337,7 +337,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -376,7 +376,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/certificates/{certificateId}",
   urlParameters: [
@@ -402,7 +402,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
index e1289ca3ddd1..47fe7384cdb0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/delegationSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class DelegationSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.DelegationSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DelegationSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class DelegationSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class DelegationSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class DelegationSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class DelegationSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: Models.DelegationSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: Models.DelegationSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalDelegationSettings>, callback?: coreHttp.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class DelegationSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/delegation",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..c537d80aeea7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/diagnosticMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Diagnostic {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Diagnostic {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Diagnostic {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.DiagnosticContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.DiagnosticContract>, callback?: coreHttp.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,19 +281,19 @@ export class Diagnostic {
    * @param [options] The optional parameters
    * @returns Promise<Models.DiagnosticListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.DiagnosticListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.DiagnosticCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.DiagnosticCollection>, callback?: coreHttp.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -305,8 +305,8 @@ export class Diagnostic {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics",
   urlParameters: [
@@ -334,7 +334,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -360,7 +360,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -387,7 +387,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -426,7 +426,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -458,7 +458,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}",
   urlParameters: [
@@ -484,7 +484,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..feac8aa81707 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/emailTemplateMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class EmailTemplate {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,7 +73,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -87,7 +87,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -102,8 +102,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -130,7 +130,7 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -144,7 +144,7 @@ export class EmailTemplate {
    * 'requestDeveloperNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,8 +159,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class EmailTemplate {
    * @param parameters Email Template update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -219,8 +219,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.EmailTemplateContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.EmailTemplateContract>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -249,9 +249,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -268,7 +268,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -286,8 +286,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -316,9 +316,9 @@ export class EmailTemplate {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,7 +334,7 @@ export class EmailTemplate {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -351,8 +351,8 @@ export class EmailTemplate {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -371,19 +371,19 @@ export class EmailTemplate {
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.EmailTemplateListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.EmailTemplateCollection>, callback?: coreHttp.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -395,8 +395,8 @@ export class EmailTemplate {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates",
   urlParameters: [
@@ -424,7 +424,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -477,7 +477,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -514,7 +514,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -546,7 +546,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/templates/{templateName}",
   urlParameters: [
@@ -572,7 +572,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..f3e9fed92627 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Group {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupGetResponse>;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
+  get(resourceGroupName: string, serviceName: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Group {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Group {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Group {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
index 819dff540d27..5a1f81e9495c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/groupUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/groupUserMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
+  list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -111,7 +111,7 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserCreateResponse>
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserCreateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,7 +119,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -128,8 +128,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  create(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -149,9 +149,9 @@ export class GroupUser {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -159,7 +159,7 @@ export class GroupUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -168,8 +168,8 @@ export class GroupUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,19 +188,19 @@ export class GroupUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.GroupUserListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.GroupUserListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -212,8 +212,8 @@ export class GroupUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users",
   urlParameters: [
@@ -242,7 +242,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -268,7 +268,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOperationSpec: msRest.OperationSpec = {
+const createOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -298,7 +298,7 @@ const createOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/groups/{groupId}/users/{userId}",
   urlParameters: [
@@ -324,7 +324,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index a9dc72ce8502..6881b4086f45 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/identityProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class IdentityProvider {
    * 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class IdentityProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.IdentityProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.IdentityProviderContract>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -282,19 +282,19 @@ export class IdentityProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.IdentityProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IdentityProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IdentityProviderList>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IdentityProviderList>, callback?: coreHttp.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -306,8 +306,8 @@ export class IdentityProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders",
   urlParameters: [
@@ -332,7 +332,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -358,7 +358,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -385,7 +385,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -424,7 +424,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -456,7 +456,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/identityProviders/{identityProviderName}",
   urlParameters: [
@@ -482,7 +482,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
index 74263bc8328b..5bf06e0ce889 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/issueMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Issue {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.IssueListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.IssueListByServiceOptionalParams | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueGetResponse>;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param issueId Issue identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Issue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, issueId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueContract>): void;
+  get(resourceGroupName: string, serviceName: string, issueId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueContract>, callback?: coreHttp.ServiceCallback<Models.IssueContract>): Promise<Models.IssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -100,19 +100,19 @@ export class Issue {
    * @param [options] The optional parameters
    * @returns Promise<Models.IssueListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.IssueListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.IssueCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.IssueCollection>, callback?: coreHttp.ServiceCallback<Models.IssueCollection>): Promise<Models.IssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -124,8 +124,8 @@ export class Issue {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues",
   urlParameters: [
@@ -153,7 +153,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/issues/{issueId}",
   urlParameters: [
@@ -180,7 +180,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
index ceea06065217..d32282984e6c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/loggerMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Logger {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param loggerId Logger identifier. Must be unique in the API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  get(resourceGroupName: string, serviceName: string, loggerId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Logger {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.LoggerContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.LoggerContract>, callback?: coreHttp.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<Models.LoggerListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.LoggerListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.LoggerCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.LoggerCollection>, callback?: coreHttp.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Logger {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/loggers/{loggerId}",
   urlParameters: [
@@ -470,7 +470,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
index 4a2e2f094b53..2e3813915fc3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/networkStatus.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/networkStatusMappers";
 import * as Parameters from "../models/parameters";
@@ -35,21 +35,21 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,7 +71,7 @@ export class NetworkStatus {
    * @param [options] The optional parameters
    * @returns Promise<Models.NetworkStatusListByLocationResponse>
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NetworkStatusListByLocationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class NetworkStatus {
    * Azure Regions like West US, East US, South Central US.
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -88,8 +88,8 @@ export class NetworkStatus {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContract>, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NetworkStatusContract>): void;
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NetworkStatusContract>, callback?: coreHttp.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -103,8 +103,8 @@ export class NetworkStatus {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/networkstatus",
   urlParameters: [
@@ -140,7 +140,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByLocationOperationSpec: msRest.OperationSpec = {
+const listByLocationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/locations/{locationName}/networkstatus",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
index ee40ffce7f34..de481b030736 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notification.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Notification {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -69,7 +69,7 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -79,7 +79,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -90,8 +90,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Notification {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -135,8 +135,8 @@ export class Notification {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.NotificationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.NotificationContract>, callback?: coreHttp.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -154,19 +154,19 @@ export class Notification {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.NotificationCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.NotificationCollection>, callback?: coreHttp.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -178,8 +178,8 @@ export class Notification {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications",
   urlParameters: [
@@ -206,7 +206,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -232,7 +232,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}",
   urlParameters: [
@@ -259,7 +259,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
index 33904e45df9c..ebfd03f497fd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientEmail.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientEmailMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailCollection>, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientEmail {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailContract>, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientEmailContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientEmailContract>, callback?: coreHttp.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param email Email identifier.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientEmail {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientEmails/{email}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
index 0f5df0fb3ac3..0cfc112d1d85 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/notificationRecipientUser.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/notificationRecipientUserMappers";
 import * as Parameters from "../models/parameters";
@@ -37,7 +37,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserListByNotificationResponse>
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserListByNotificationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -47,7 +47,7 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserCollection>, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserCollection>): void;
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserCollection>, callback?: coreHttp.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<boolean>, callback?: coreHttp.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -132,7 +132,7 @@ export class NotificationRecipientUser {
    * @param [options] The optional parameters
    * @returns Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,7 +143,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -155,8 +155,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserContract>, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RecipientUserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RecipientUserContract>, callback?: coreHttp.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -192,7 +192,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -204,8 +204,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,8 +220,8 @@ export class NotificationRecipientUser {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByNotificationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByNotificationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers",
   urlParameters: [
@@ -247,7 +247,7 @@ const listByNotificationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -273,7 +273,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
@@ -303,7 +303,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/notifications/{notificationName}/recipientUsers/{userId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
index 6b7772a13ea3..200f347aa0f1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/openIdConnectProviderMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class OpenIdConnectProvider {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, opid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class OpenIdConnectProvider {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: coreHttp.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class OpenIdConnectProvider {
    * @param [options] The optional parameters
    * @returns Promise<Models.OpenIdConnectProviderListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OpenIdConnectProviderListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: coreHttp.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class OpenIdConnectProvider {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/openidConnectProviders/{opid}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
index 770b86b58870..7338254dd123 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/operationOperations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/operationOperationsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class OperationOperations {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class OperationOperations {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class OperationOperations {
    * @param [options] The optional parameters
    * @returns Promise<Models.OperationListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.OperationListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class OperationOperations {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operationsByTags",
   urlParameters: [
@@ -126,7 +126,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
index f9736328e80a..b9e89e968493 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policyMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,21 +66,21 @@ export class Policy {
    * @param [options] The optional parameters
    * @returns Promise<Models.PolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -104,15 +104,15 @@ export class Policy {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: Models.PolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: Models.PolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,7 +138,7 @@ export class Policy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -146,8 +146,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: Models.PolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: Models.PolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class Policy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -176,7 +176,7 @@ export class Policy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -185,8 +185,8 @@ export class Policy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,8 +200,8 @@ export class Policy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies",
   urlParameters: [
@@ -226,7 +226,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -252,7 +252,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -280,7 +280,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
@@ -319,7 +319,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
index d0ba7845bb1f..74b9659c45b9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policySnippet.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/policySnippetMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class PolicySnippet {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicySnippetsCollection>, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PolicySnippetsCollection>, callback?: coreHttp.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -60,8 +60,8 @@ export class PolicySnippet {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/policySnippets",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
index 31904c098334..173a8de78133 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -67,7 +67,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -75,7 +75,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,8 +84,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -106,7 +106,7 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGetResponse>;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,7 +114,7 @@ export class Product {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -123,8 +123,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -155,7 +155,7 @@ export class Product {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -165,8 +165,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.ProductContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.ProductContract>, callback?: coreHttp.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -189,9 +189,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -238,9 +238,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -250,7 +250,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -261,8 +261,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -288,15 +288,15 @@ export class Product {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options: Models.ProductListByTagsOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ProductListByTagsOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -313,19 +313,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ProductCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ProductCollection>, callback?: coreHttp.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -341,19 +341,19 @@ export class Product {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductListByTagsNextResponse>
    */
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductListByTagsNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByTagsNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ProductListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -365,8 +365,8 @@ export class Product {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products",
   urlParameters: [
@@ -396,7 +396,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -422,7 +422,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -449,7 +449,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -488,7 +488,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -520,7 +520,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}",
   urlParameters: [
@@ -547,7 +547,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsOperationSpec: msRest.OperationSpec = {
+const listByTagsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/productsByTags",
   urlParameters: [
@@ -576,7 +576,7 @@ const listByTagsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -597,7 +597,7 @@ const listByServiceNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTagsNextOperationSpec: msRest.OperationSpec = {
+const listByTagsNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
index c3bad7380501..29721dc07229 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productApi.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productApiMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductApi {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,9 +74,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -86,7 +86,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -97,8 +97,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -132,7 +132,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -143,8 +143,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiContract>, callback?: coreHttp.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,9 +166,9 @@ export class ProductApi {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -178,7 +178,7 @@ export class ProductApi {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -189,8 +189,8 @@ export class ProductApi {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -209,19 +209,19 @@ export class ProductApi {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductApiListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductApiListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ApiCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ApiCollection>, callback?: coreHttp.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -233,8 +233,8 @@ export class ProductApi {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis",
   urlParameters: [
@@ -263,7 +263,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -318,7 +318,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/apis/{apiId}",
   urlParameters: [
@@ -344,7 +344,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
index d40911e555c8..67f7c51eda2e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductGroup {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -73,9 +73,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -84,7 +84,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,8 +94,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -127,7 +127,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -137,8 +137,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupContract>, callback?: coreHttp.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -159,9 +159,9 @@ export class ProductGroup {
    * instance.
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -170,7 +170,7 @@ export class ProductGroup {
    * @param groupId Group identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -180,8 +180,8 @@ export class ProductGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,19 +200,19 @@ export class ProductGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductGroupListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductGroupListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -224,8 +224,8 @@ export class ProductGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups",
   urlParameters: [
@@ -254,7 +254,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const checkEntityExistsOperationSpec: msRest.OperationSpec = {
+const checkEntityExistsOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -279,7 +279,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -309,7 +309,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/groups/{groupId}",
   urlParameters: [
@@ -335,7 +335,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
index bd7e68b41ad9..a47a83954212 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productPolicyMappers";
 import * as Parameters from "../models/parameters";
@@ -35,7 +35,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyListByProductResponse>
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyListByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -43,7 +43,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PolicyCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PolicyCollection>, callback?: coreHttp.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +74,7 @@ export class ProductPolicy {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductPolicyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductPolicyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -82,7 +82,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -91,8 +91,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -121,7 +121,7 @@ export class ProductPolicy {
    * instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -130,8 +130,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductPolicyGetOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductPolicyGetOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -162,7 +162,7 @@ export class ProductPolicy {
    * @param parameters The policy contents to apply.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -172,8 +172,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PolicyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PolicyContract>, callback?: coreHttp.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -195,9 +195,9 @@ export class ProductPolicy {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,7 +207,7 @@ export class ProductPolicy {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -218,8 +218,8 @@ export class ProductPolicy {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,8 +234,8 @@ export class ProductPolicy {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByProductOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies",
   urlParameters: [
@@ -261,7 +261,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -288,7 +288,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -317,7 +317,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
@@ -357,7 +357,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/policies/{policyId}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
index df3e0fbae8f6..78ae6452d116 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productSubscriptions.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/productSubscriptionsMappers";
 import * as Parameters from "../models/parameters";
@@ -43,7 +43,7 @@ export class ProductSubscriptions {
    * instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -52,8 +52,8 @@ export class ProductSubscriptions {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -71,19 +71,19 @@ export class ProductSubscriptions {
    * @param [options] The optional parameters
    * @returns Promise<Models.ProductSubscriptionsListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ProductSubscriptionsListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -95,8 +95,8 @@ export class ProductSubscriptions {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/subscriptions",
   urlParameters: [
@@ -125,7 +125,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
index af83fe7a925d..432482302489 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/property.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/propertyMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Property {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param propId Identifier of the property.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, propId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Property {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PropertyContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PropertyContract>, callback?: coreHttp.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class Property {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class Property {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Property {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -266,19 +266,19 @@ export class Property {
    * @param [options] The optional parameters
    * @returns Promise<Models.PropertyListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.PropertyListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PropertyCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PropertyCollection>, callback?: coreHttp.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -290,8 +290,8 @@ export class Property {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties",
   urlParameters: [
@@ -319,7 +319,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -345,7 +345,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -372,7 +372,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -411,7 +411,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -443,7 +443,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/properties/{propId}",
   urlParameters: [
@@ -469,7 +469,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
index e4976fa216f6..06ca471204a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByCounterKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -38,7 +38,7 @@ export class QuotaByCounterKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByCounterKeysListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByCounterKeysListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,7 +48,7 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -59,8 +59,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterCollection>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,9 +83,9 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,7 +96,7 @@ export class QuotaByCounterKeys {
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -108,8 +108,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class QuotaByCounterKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
@@ -151,7 +151,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..41f8e762396b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/quotaByPeriodKeysMappers";
 import * as Parameters from "../models/parameters";
@@ -39,7 +39,7 @@ export class QuotaByPeriodKeys {
    * @param [options] The optional parameters
    * @returns Promise<Models.QuotaByPeriodKeysGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -50,7 +50,7 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -62,8 +62,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.QuotaCounterContract>): void;
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.QuotaCounterContract>, callback?: coreHttp.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -87,9 +87,9 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -101,7 +101,7 @@ export class QuotaByPeriodKeys {
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,8 +114,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,8 +131,8 @@ export class QuotaByPeriodKeys {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
@@ -159,7 +159,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/quotas/{quotaCounterKey}/periods/{quotaPeriodKey}",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
index a563773df876..12217e5f5dd2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/region.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/regionMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceResponse>
    */
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class Region {
    * @param [options] The optional parameters
    * @returns Promise<Models.RegionListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.RegionListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.RegionListResult>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.RegionListResult>, callback?: coreHttp.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class Region {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/regions",
   urlParameters: [
@@ -114,7 +114,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
index 328d1f592dab..2f5ab070e0e2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/reports.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/reportsMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class Reports {
    * @param filter The filter to apply on the operation.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -101,7 +101,7 @@ export class Reports {
    * | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -121,8 +121,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -193,8 +193,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -243,7 +243,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -314,7 +314,7 @@ export class Reports {
    * | </br>
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -334,8 +334,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByGeoOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeo(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByGeoOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -384,7 +384,7 @@ export class Reports {
    * serviceTimeMin | select |     |     | </br>| serviceTimeMax | select |     |     | </br>
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -403,8 +403,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscription(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListBySubscriptionOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -461,7 +461,7 @@ export class Reports {
    * TimeSpan(hours, minutes, seconds)).
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -484,8 +484,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTime(resourceGroupName: string, serviceName: string, filter: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -521,7 +521,7 @@ export class Reports {
    * filter | eq |     | </br>| subscriptionId | filter | eq |     | </br>
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -533,8 +533,8 @@ export class Reports {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | msRest.ServiceCallback<Models.RequestReportCollection>, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: coreHttp.ServiceCallback<Models.RequestReportCollection>): void;
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | coreHttp.ServiceCallback<Models.RequestReportCollection>, callback?: coreHttp.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -552,19 +552,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -580,19 +580,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByUserNextResponse>
    */
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByUserNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByUserNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
+  listByUserNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByUserNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -608,19 +608,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -636,19 +636,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -664,19 +664,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByGeoNextResponse>
    */
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByGeoNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByGeoNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
+  listByGeoNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByGeoNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -692,19 +692,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListBySubscriptionNextResponse>
    */
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListBySubscriptionNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
+  listBySubscriptionNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -720,19 +720,19 @@ export class Reports {
    * @param [options] The optional parameters
    * @returns Promise<Models.ReportsListByTimeNextResponse>
    */
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.ReportsListByTimeNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByTimeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
+  listByTimeNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.ReportCollection>): void;
+  listByTimeNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.ReportCollection>, callback?: coreHttp.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -744,8 +744,8 @@ export class Reports {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByApiOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byApi",
   urlParameters: [
@@ -774,7 +774,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserOperationSpec: msRest.OperationSpec = {
+const listByUserOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byUser",
   urlParameters: [
@@ -803,7 +803,7 @@ const listByUserOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byOperation",
   urlParameters: [
@@ -832,7 +832,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byProduct",
   urlParameters: [
@@ -861,7 +861,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoOperationSpec: msRest.OperationSpec = {
+const listByGeoOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byGeo",
   urlParameters: [
@@ -889,7 +889,7 @@ const listByGeoOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/bySubscription",
   urlParameters: [
@@ -918,7 +918,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeOperationSpec: msRest.OperationSpec = {
+const listByTimeOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byTime",
   urlParameters: [
@@ -948,7 +948,7 @@ const listByTimeOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByRequestOperationSpec: msRest.OperationSpec = {
+const listByRequestOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/reports/byRequest",
   urlParameters: [
@@ -976,7 +976,7 @@ const listByRequestOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -997,7 +997,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByUserNextOperationSpec: msRest.OperationSpec = {
+const listByUserNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1018,7 +1018,7 @@ const listByUserNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1039,7 +1039,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1060,7 +1060,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByGeoNextOperationSpec: msRest.OperationSpec = {
+const listByGeoNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1081,7 +1081,7 @@ const listByGeoNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
+const listBySubscriptionNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1102,7 +1102,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByTimeNextOperationSpec: msRest.OperationSpec = {
+const listByTimeNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
index dd971ea317b3..aa821fe29d3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signInSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignInSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignInSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignInSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignInSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignInSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignInSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignInSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: Models.SignInSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSigninSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: Models.SignInSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSigninSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignInSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signin",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
index bd3214a4dffd..036908e63887 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/signUpSettingsMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class SignUpSettings {
    * @param [options] The optional parameters
    * @returns Promise<Models.SignUpSettingsGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SignUpSettingsGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class SignUpSettings {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class SignUpSettings {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -148,7 +148,7 @@ export class SignUpSettings {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class SignUpSettings {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: Models.SignUpSettingsCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.PortalSignupSettings>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: Models.SignUpSettingsCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.PortalSignupSettings>, callback?: coreHttp.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -171,8 +171,8 @@ export class SignUpSettings {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -197,7 +197,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -223,7 +223,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
@@ -254,7 +254,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/portalsettings/signup",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
index 630cfbf109fc..c665a6438d1f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/subscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class Subscription {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,7 +68,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -76,7 +76,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -85,8 +85,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -115,7 +115,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -124,8 +124,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class Subscription {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -166,8 +166,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionContract>, callback?: coreHttp.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,9 +190,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,9 +239,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -251,7 +251,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -262,8 +262,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -283,9 +283,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -293,7 +293,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -302,8 +302,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -322,9 +322,9 @@ export class Subscription {
    * @param sid Subscription entity Identifier. The entity represents the association between a user
    * and a product in API Management.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -332,7 +332,7 @@ export class Subscription {
    * and a product in API Management.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -341,8 +341,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -360,19 +360,19 @@ export class Subscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.SubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.SubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -384,8 +384,8 @@ export class Subscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions",
   urlParameters: [
@@ -413,7 +413,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -439,7 +439,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -466,7 +466,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -506,7 +506,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -539,7 +539,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}",
   urlParameters: [
@@ -565,7 +565,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regeneratePrimaryKey",
   urlParameters: [
@@ -589,7 +589,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/subscriptions/{sid}/regenerateSecondaryKey",
   urlParameters: [
@@ -613,7 +613,7 @@ const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..b8b1bf0c9d72 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagMappers";
 import * as Parameters from "../models/parameters";
@@ -47,7 +47,7 @@ export class Tag {
    * Management service instance.
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -58,8 +58,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -84,7 +84,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByOperationResponse>
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -95,7 +95,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -107,8 +107,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -134,7 +134,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByOperationResponse>
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -145,7 +145,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -157,8 +157,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -184,7 +184,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToOperationResponse>
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToOperationResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -195,7 +195,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -207,8 +207,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -232,9 +232,9 @@ export class Tag {
    * Management service instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -245,7 +245,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -257,8 +257,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -289,7 +289,7 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -298,8 +298,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,7 +321,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByApiResponse>
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -330,7 +330,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -340,8 +340,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -364,7 +364,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByApiResponse>
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -373,7 +373,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -383,8 +383,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -407,7 +407,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToApiResponse>
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToApiResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -416,7 +416,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -426,8 +426,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -448,9 +448,9 @@ export class Tag {
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -459,7 +459,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -469,8 +469,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -500,7 +500,7 @@ export class Tag {
    * instance.
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -509,8 +509,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -532,7 +532,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateByProductResponse>
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -541,7 +541,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -551,8 +551,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -575,7 +575,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetByProductResponse>
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetByProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -584,7 +584,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -594,8 +594,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -618,7 +618,7 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagAssignToProductResponse>
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagAssignToProductResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -627,7 +627,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -637,8 +637,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -659,9 +659,9 @@ export class Tag {
    * instance.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -670,7 +670,7 @@ export class Tag {
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -680,8 +680,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -707,15 +707,15 @@ export class Tag {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -734,14 +734,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetEntityStateResponse>
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetEntityStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -749,8 +749,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -770,14 +770,14 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase): Promise<Models.TagGetResponse>;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param tagId Tag identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -785,8 +785,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
+  get(resourceGroupName: string, serviceName: string, tagId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -815,7 +815,7 @@ export class Tag {
    * @param parameters Create parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -824,8 +824,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: Models.TagCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.TagContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: Models.TagCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.TagContract>, callback?: coreHttp.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -847,9 +847,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -859,7 +859,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -870,8 +870,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -893,9 +893,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -904,7 +904,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -914,8 +914,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -934,19 +934,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByOperationNextResponse>
    */
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByOperationNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByOperationNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -962,19 +962,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByApiNextResponse>
    */
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByApiNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByApiNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -990,19 +990,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByProductNextResponse>
    */
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByProductNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByProductNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1018,19 +1018,19 @@ export class Tag {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagCollection>, callback?: coreHttp.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1042,8 +1042,8 @@ export class Tag {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByOperationOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags",
   urlParameters: [
@@ -1073,7 +1073,7 @@ const listByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
+const getEntityStateByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1101,7 +1101,7 @@ const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByOperationOperationSpec: msRest.OperationSpec = {
+const getByOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1130,7 +1130,7 @@ const getByOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToOperationOperationSpec: msRest.OperationSpec = {
+const assignToOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1161,7 +1161,7 @@ const assignToOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromOperationOperationSpec: msRest.OperationSpec = {
+const detachFromOperationOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/operations/{operationId}/tags/{tagId}",
   urlParameters: [
@@ -1188,7 +1188,7 @@ const detachFromOperationOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiOperationSpec: msRest.OperationSpec = {
+const listByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags",
   urlParameters: [
@@ -1217,7 +1217,7 @@ const listByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
+const getEntityStateByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1244,7 +1244,7 @@ const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByApiOperationSpec: msRest.OperationSpec = {
+const getByApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1272,7 +1272,7 @@ const getByApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToApiOperationSpec: msRest.OperationSpec = {
+const assignToApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1304,7 +1304,7 @@ const assignToApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromApiOperationSpec: msRest.OperationSpec = {
+const detachFromApiOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/tags/{tagId}",
   urlParameters: [
@@ -1330,7 +1330,7 @@ const detachFromApiOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductOperationSpec: msRest.OperationSpec = {
+const listByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags",
   urlParameters: [
@@ -1359,7 +1359,7 @@ const listByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
+const getEntityStateByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1386,7 +1386,7 @@ const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getByProductOperationSpec: msRest.OperationSpec = {
+const getByProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1414,7 +1414,7 @@ const getByProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const assignToProductOperationSpec: msRest.OperationSpec = {
+const assignToProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1444,7 +1444,7 @@ const assignToProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const detachFromProductOperationSpec: msRest.OperationSpec = {
+const detachFromProductOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/products/{productId}/tags/{tagId}",
   urlParameters: [
@@ -1470,7 +1470,7 @@ const detachFromProductOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags",
   urlParameters: [
@@ -1499,7 +1499,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityStateOperationSpec: msRest.OperationSpec = {
+const getEntityStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1525,7 +1525,7 @@ const getEntityStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1552,7 +1552,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1591,7 +1591,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1623,7 +1623,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tags/{tagId}",
   urlParameters: [
@@ -1649,7 +1649,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByOperationNextOperationSpec: msRest.OperationSpec = {
+const listByOperationNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1670,7 +1670,7 @@ const listByOperationNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByApiNextOperationSpec: msRest.OperationSpec = {
+const listByApiNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1691,7 +1691,7 @@ const listByApiNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByProductNextOperationSpec: msRest.OperationSpec = {
+const listByProductNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
@@ -1712,7 +1712,7 @@ const listByProductNextOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
index b662081c7fcb..174b64c28bd7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tagResource.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tagResourceMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class TagResource {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -64,19 +64,19 @@ export class TagResource {
    * @param [options] The optional parameters
    * @returns Promise<Models.TagResourceListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TagResourceListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TagResourceCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TagResourceCollection>, callback?: coreHttp.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -88,8 +88,8 @@ export class TagResource {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tagResources",
   urlParameters: [
@@ -117,7 +117,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index 79018f752dfd..f4a53f233db4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.TenantAccessGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -65,21 +65,21 @@ export class TenantAccess {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,9 +98,9 @@ export class TenantAccess {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class TenantAccess {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class TenantAccess {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,23 +138,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -170,23 +170,23 @@ export class TenantAccess {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -199,8 +199,8 @@ export class TenantAccess {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -226,7 +226,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -253,7 +253,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}",
   urlParameters: [
@@ -285,7 +285,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regeneratePrimaryKey",
   urlParameters: [
@@ -309,7 +309,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
index c7fbd0f24509..f29079060881 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantAccessGitMappers";
 import * as Parameters from "../models/parameters";
@@ -33,21 +33,21 @@ export class TenantAccessGit {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantAccessGitGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantAccessGitGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.AccessInformationContract>): void;
+  get(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.AccessInformationContract>, callback?: coreHttp.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,23 +63,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -95,23 +95,23 @@ export class TenantAccessGit {
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,8 +124,8 @@ export class TenantAccessGit {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git",
   urlParameters: [
@@ -152,7 +152,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
+const regeneratePrimaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regeneratePrimaryKey",
   urlParameters: [
@@ -176,7 +176,7 @@ const regeneratePrimaryKeyOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const regenerateSecondaryKeyOperationSpec: msRest.OperationSpec = {
+const regenerateSecondaryKeyOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}/git/regenerateSecondaryKey",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
index be1e84173988..fefb4e8f6dd4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantConfiguration.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as coreHttp from "@azure/core-http";
+import * as coreArm from "@azure/core-arm";
 import * as Models from "../models";
 import * as Mappers from "../models/tenantConfigurationMappers";
 import * as Parameters from "../models/parameters";
@@ -36,7 +36,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationDeployResponse>
    */
-  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
+  deploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationDeployResponse> {
     return this.beginDeploy(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationDeployResponse>;
   }
@@ -50,7 +50,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationSaveResponse>
    */
-  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
+  save(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationSaveResponse> {
     return this.beginSave(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationSaveResponse>;
   }
@@ -64,7 +64,7 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationValidateResponse>
    */
-  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
+  validate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationValidateResponse> {
     return this.beginValidate(resourceGroupName,serviceName,parameters,options)
       .then(lroPoller => lroPoller.pollUntilFinished()) as Promise<Models.TenantConfigurationValidateResponse>;
   }
@@ -77,21 +77,21 @@ export class TenantConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.TenantConfigurationGetSyncStateResponse>
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase): Promise<Models.TenantConfigurationGetSyncStateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSyncState(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
+  getSyncState(resourceGroupName: string, serviceName: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
+  getSyncState(resourceGroupName: string, serviceName: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: coreHttp.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -109,9 +109,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Deploy Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginDeploy(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -130,9 +130,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Save Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginSave(resourceGroupName: string, serviceName: string, parameters: Models.SaveConfigurationParameter, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -151,9 +151,9 @@ export class TenantConfiguration {
    * @param serviceName The name of the API Management service.
    * @param parameters Validate Configuration parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
+   * @returns Promise<coreArm.LROPoller>
    */
-  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
+  beginValidate(resourceGroupName: string, serviceName: string, parameters: Models.DeployConfigurationParameters, options?: coreHttp.RequestOptionsBase): Promise<coreArm.LROPoller> {
     return this.client.sendLRORequest(
       {
         resourceGroupName,
@@ -167,8 +167,8 @@ export class TenantConfiguration {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const getSyncStateOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const getSyncStateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/syncState",
   urlParameters: [
@@ -194,7 +194,7 @@ const getSyncStateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginDeployOperationSpec: msRest.OperationSpec = {
+const beginDeployOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/deploy",
   urlParameters: [
@@ -228,7 +228,7 @@ const beginDeployOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginSaveOperationSpec: msRest.OperationSpec = {
+const beginSaveOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/save",
   urlParameters: [
@@ -262,7 +262,7 @@ const beginSaveOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginValidateOperationSpec: msRest.OperationSpec = {
+const beginValidateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{configurationName}/validate",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
index 43a8c279ccc7..3ea13cf17f4d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userMappers";
 import * as Parameters from "../models/parameters";
@@ -39,15 +39,15 @@ export class User {
    * @param serviceName The name of the API Management service.
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -66,14 +66,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetEntityTagResponse>
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetEntityTagResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -81,8 +81,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,14 +102,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetResponse>
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGetResponse>;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -117,8 +117,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  get(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  get(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
+  get(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  get(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class User {
    * @param parameters Create or update parameters.
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -156,8 +156,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: coreHttp.ServiceCallback<Models.UserContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | coreHttp.ServiceCallback<Models.UserContract>, callback?: coreHttp.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -179,9 +179,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -225,9 +225,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -236,7 +236,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: coreHttp.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, userId: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -269,14 +269,14 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGenerateSsoUrlResponse>
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGenerateSsoUrlResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -284,8 +284,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
-  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): void;
+  generateSsoUrl(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: coreHttp.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -306,7 +306,7 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGetSharedAccessTokenResponse>
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGetSharedAccessTokenResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -314,7 +314,7 @@ export class User {
    * @param parameters Create Authorization Token parameters.
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -323,8 +323,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserTokenResult>, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserTokenResult>): void;
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserTokenParameters, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserTokenResult>, callback?: coreHttp.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -343,19 +343,19 @@ export class User {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserListByServiceNextResponse>
    */
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserListByServiceNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserCollection>, callback?: coreHttp.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -367,8 +367,8 @@ export class User {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByServiceOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listByServiceOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users",
   urlParameters: [
@@ -397,7 +397,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getEntityTagOperationSpec: msRest.OperationSpec = {
+const getEntityTagOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "HEAD",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -423,7 +423,7 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getOperationSpec: msRest.OperationSpec = {
+const getOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -450,7 +450,7 @@ const getOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const createOrUpdateOperationSpec: msRest.OperationSpec = {
+const createOrUpdateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PUT",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -489,7 +489,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const updateOperationSpec: msRest.OperationSpec = {
+const updateOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "PATCH",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -521,7 +521,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const deleteMethodOperationSpec: msRest.OperationSpec = {
+const deleteMethodOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "DELETE",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}",
   urlParameters: [
@@ -549,7 +549,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const generateSsoUrlOperationSpec: msRest.OperationSpec = {
+const generateSsoUrlOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl",
   urlParameters: [
@@ -575,7 +575,7 @@ const generateSsoUrlOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
+const getSharedAccessTokenOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token",
   urlParameters: [
@@ -608,7 +608,7 @@ const getSharedAccessTokenOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listByServiceNextOperationSpec: msRest.OperationSpec = {
+const listByServiceNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
index d9e3dbdaf146..a89f508bb26c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Mappers from "../models/userConfirmationPasswordMappers";
 import * as Parameters from "../models/parameters";
 import { ApiManagementClientContext } from "../apiManagementClientContext";
@@ -31,16 +31,16 @@ export class UserConfirmationPassword {
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<coreHttp.RestResponse>
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<coreHttp.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,8 +48,8 @@ export class UserConfirmationPassword {
    * @param options The optional parameters
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  send(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<void>, callback?: coreHttp.ServiceCallback<void>): Promise<coreHttp.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -63,8 +63,8 @@ export class UserConfirmationPassword {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const sendOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const sendOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "POST",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/confirmations/password/send",
   urlParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
index 0387dbc52c58..2458f939727f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userGroup.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userGroupMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserGroup {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserGroup {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserGroupListOptionalParams, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserGroupListOptionalParams | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserGroup {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserGroupListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserGroupListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.GroupCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.GroupCollection>, callback?: coreHttp.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserGroup {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/groups",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
index e84a1e21f620..292ac034ceb2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userIdentities.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userIdentitiesMappers";
 import * as Parameters from "../models/parameters";
@@ -34,14 +34,14 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListResponse>
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserIdentities {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserIdentities {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserIdentitiesListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserIdentitiesListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.UserIdentityCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.UserIdentityCollection>, callback?: coreHttp.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserIdentities {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/identities",
   urlParameters: [
@@ -119,7 +119,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
index bf8816577ff9..c75728d78f8f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userSubscription.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as coreHttp from "@azure/core-http";
 import * as Models from "../models";
 import * as Mappers from "../models/userSubscriptionMappers";
 import * as Parameters from "../models/parameters";
@@ -41,7 +41,7 @@ export class UserSubscription {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -49,8 +49,8 @@ export class UserSubscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserSubscriptionListOptionalParams, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  list(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserSubscriptionListOptionalParams | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -68,19 +68,19 @@ export class UserSubscription {
    * @param [options] The optional parameters
    * @returns Promise<Models.UserSubscriptionListNextResponse>
    */
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase): Promise<Models.UserSubscriptionListNextResponse>;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options: coreHttp.RequestOptionsBase, callback: coreHttp.ServiceCallback<Models.SubscriptionCollection>): void;
+  listNext(nextPageLink: string, options?: coreHttp.RequestOptionsBase | coreHttp.ServiceCallback<Models.SubscriptionCollection>, callback?: coreHttp.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -92,8 +92,8 @@ export class UserSubscription {
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listOperationSpec: msRest.OperationSpec = {
+const serializer = new coreHttp.Serializer(Mappers);
+const listOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/subscriptions",
   urlParameters: [
@@ -122,7 +122,7 @@ const listOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const listNextOperationSpec: msRest.OperationSpec = {
+const listNextOperationSpec: coreHttp.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
   path: "{nextLink}",

From f501413e6ae7140e48daa376b7491a553e3a4161 Mon Sep 17 00:00:00 2001
From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com>
Date: Sun, 4 Aug 2019 02:46:01 +0000
Subject: [PATCH 24/24] Generated from 82ca10eed64d6abf9f1483909e8767cccb0faa59
 (#4539)

removed readonly property
---
 sdk/apimanagement/arm-apimanagement/package.json  | 6 +++---
 sdk/apimanagement/arm-apimanagement/tsconfig.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index b3a26bfc5de1..96d31d22ad3e 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -4,9 +4,9 @@
   "description": "ApiManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.1.0",
   "dependencies": {
-    "@azure/core-arm": "^1.0.0-preview.1",
-    "@azure/core-http": "^1.0.0-preview.1",
-    "tslib": "^1.9.3"
+    "@azure/ms-rest-azure-js": "^2.0.0",
+    "@azure/ms-rest-js": "^2.0.3",
+    "tslib": "^1.10.0"
   },
   "keywords": [
     "node",
diff --git a/sdk/apimanagement/arm-apimanagement/tsconfig.json b/sdk/apimanagement/arm-apimanagement/tsconfig.json
index 87bbf5b5fa49..422b584abd5e 100644
--- a/sdk/apimanagement/arm-apimanagement/tsconfig.json
+++ b/sdk/apimanagement/arm-apimanagement/tsconfig.json
@@ -9,7 +9,7 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["es6"],
+    "lib": ["es6", "dom"],
     "declaration": true,
     "outDir": "./esm",
     "importHelpers": true