diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index f1a35dab1cc1..edac88e902b7 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1555,6 +1555,7 @@ packages:
   /@opentelemetry/node/0.22.0_@opentelemetry+api@1.0.3:
     resolution: {integrity: sha512-+HhGbDruQ7cwejVOIYyxRa28uosnG8W95NiQZ6qE8PXXPsDSyGeftAPbtYpGit0H2f5hrVcMlwmWHeAo9xkSLA==}
     engines: {node: '>=8.0.0'}
+    deprecated: Package renamed to @opentelemetry/sdk-trace-node
     peerDependencies:
       '@opentelemetry/api': ^1.0.0
     dependencies:
@@ -8414,7 +8415,7 @@ packages:
     dev: false
 
   file:projects/arm-containerregistry.tgz:
-    resolution: {integrity: sha512-iOcYxbtgUUyIJduY+oKd6dLRCD0nakKGeZGWDfFfIR5ENhKMLTchXaZGBQ2Mxj+Thtm1UIkJZ25NTIe2eW7bpA==, tarball: file:projects/arm-containerregistry.tgz}
+    resolution: {integrity: sha512-si1/HJZ4OLzHAuxrVsQZNQv3SssXpBSFcpQGVOWTC37j48kEg0JxQREIfu0vhIteBBSLDR0IOCDA22z1QUKxyA==, tarball: file:projects/arm-containerregistry.tgz}
     name: '@rush-temp/arm-containerregistry'
     version: 0.0.0
     dependencies:
@@ -8427,6 +8428,7 @@ packages:
       cross-env: 7.0.3
       mkdirp: 1.0.4
       mocha: 7.2.0
+      rimraf: 3.0.2
       rollup: 1.32.1
       rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1
       tslib: 2.3.1
diff --git a/sdk/containerregistry/arm-containerregistry/CHANGELOG.md b/sdk/containerregistry/arm-containerregistry/CHANGELOG.md
index 974f4ec2289d..d17864561f5a 100644
--- a/sdk/containerregistry/arm-containerregistry/CHANGELOG.md
+++ b/sdk/containerregistry/arm-containerregistry/CHANGELOG.md
@@ -1,37 +1,11 @@
-## Release History
-
-### 10.0.0-beta.2 (Unreleased)
-
-#### Features Added
-
-#### Breaking Changes
-
-#### Bugs Fixed
-
-#### Other Changes
-
-### 10.0.0-beta.1 (2021-11-03)
-    
-**Features**
-
-  - Added Interface Request_2
-  - Added Type Alias Event_2
-  - Interface ConnectedRegistryUpdateParameters has a new optional parameter notificationsList
-  - Type Alias ConnectedRegistry has a new parameter notificationsList
-  - Enum KnownConnectedRegistryMode has a new value ReadOnly
-  - Enum KnownConnectedRegistryMode has a new value ReadWrite
+# Release History
     
-### 9.0.0-beta.1 (2021-10-20)
+## 10.0.0-beta.2 (2021-12-15)
 
-This is the first preview for the new version of the `@azure/arm-containerregistry` package that follows the new [guidelines for TypeScript SDKs](https://azure.github.io/azure-sdk/typescript_introduction.html) for Azure services.
+The package of @azure/arm-containerregistry is using our next generation design principles since version 10.0.0-beta.2, which contains breaking changes.
 
-While this package remains auto generated, the SDK generator itself has undergone changes to comply with the above guidelines in order to generate packages that are idiomatic to the JavaScript/TypeScript ecosystem and consistent with other packages for Azure services. For more on this, please see [State of the Azure SDK 2021](https://devblogs.microsoft.com/azure-sdk/state-of-the-azure-sdk-2021/).
+To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog).
 
-Please note that this version has breaking changes, all of which were made after careful consideration during the authoring of the guidelines and user studies.
+To migrate the existing applications to the latest version, please refer to [Migration Guide](https://aka.ms/js-track2-migration-guide).
 
-**Noteworthy changes and features**
-- Authentication: The packages `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` are no longer supported. Use package [@azure/identity](https://www.npmjs.com/package/@azure/identity) instead. Select a credential from Azure Identity examples based on the authentication method of your choice.
-- Callbacks: Method overloads that used callbacks have been removed and the use of promises is encouraged instead.
-- List operations now return an iterable result that follows the `PagedAsyncIterableIterator` interface as opposed to the previous model where you had to make a new request using the link to the next page.
-- Long running operations i.e. the Lro related object returned by methods whose names started with `begin`, now uses `pollUntilDone` to check whether the request is finished, instead of `pollUntilFinished`. To get the final result, use the corresponding method that will have the suffix `AndWait`.
-- The SDK only supports ECMAScript 2015 (ES6) and beyond, all projects that referenced this SDK should be upgraded to use ES6.
+To learn more, please refer to our documentation [Quick Start](https://aka.ms/js-track2-quickstart).
diff --git a/sdk/containerregistry/arm-containerregistry/README.md b/sdk/containerregistry/arm-containerregistry/README.md
index 213a7688091d..e12cb9f8d7b5 100644
--- a/sdk/containerregistry/arm-containerregistry/README.md
+++ b/sdk/containerregistry/arm-containerregistry/README.md
@@ -53,6 +53,10 @@ const subscriptionId = "00000000-0000-0000-0000-000000000000";
 const client = new ContainerRegistryManagementClient(new DefaultAzureCredential(), subscriptionId);
 ```
 
+
+### JavaScript Bundle
+To use this client library in the browser, first you need to use a bundler. For details on how to do this, please refer to our [bundling documentation](https://aka.ms/AzureSDKBundling).
+
 ## Key concepts
 
 ### ContainerRegistryManagementClient
diff --git a/sdk/containerregistry/arm-containerregistry/_meta.json b/sdk/containerregistry/arm-containerregistry/_meta.json
index 4042ad1b6cc3..707545cd7b13 100644
--- a/sdk/containerregistry/arm-containerregistry/_meta.json
+++ b/sdk/containerregistry/arm-containerregistry/_meta.json
@@ -1,7 +1,7 @@
 {
-  "commit": "5a16e5ada1ce4822b5b7cdfdefcb3974612fb33c",
+  "commit": "c737d488386fb6078db1df0911549e8900104d00",
   "readme": "specification/containerregistry/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/containerregistry/resource-manager/readme.md --use=@autorest/typescript@6.0.0-beta.14",
+  "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/containerregistry/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211130.1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "use": "@autorest/typescript@6.0.0-beta.14"
+  "use": "@autorest/typescript@6.0.0-alpha.16.20211130.1"
 }
\ No newline at end of file
diff --git a/sdk/containerregistry/arm-containerregistry/package.json b/sdk/containerregistry/arm-containerregistry/package.json
index 52a8d2323508..5384f6ec05b4 100644
--- a/sdk/containerregistry/arm-containerregistry/package.json
+++ b/sdk/containerregistry/arm-containerregistry/package.json
@@ -4,9 +4,7 @@
   "author": "Microsoft Corporation",
   "description": "A generated SDK for ContainerRegistryManagementClient.",
   "version": "10.0.0-beta.2",
-  "engines": {
-    "node": ">=12.0.0"
-  },
+  "engines": { "node": ">=12.0.0" },
   "dependencies": {
     "@azure/core-lro": "^2.2.0",
     "@azure/abort-controller": "^1.0.0",
@@ -16,13 +14,7 @@
     "@azure/core-rest-pipeline": "^1.1.0",
     "tslib": "^2.2.0"
   },
-  "keywords": [
-    "node",
-    "azure",
-    "typescript",
-    "browser",
-    "isomorphic"
-  ],
+  "keywords": ["node", "azure", "typescript", "browser", "isomorphic"],
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist-esm/src/index.js",
@@ -38,6 +30,7 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "typescript": "~4.2.0",
     "uglify-js": "^3.4.9",
+    "rimraf": "^3.0.0",
     "@azure/identity": "^2.0.1",
     "@azure-tools/test-recorder": "^1.0.0",
     "mocha": "^7.1.1",
@@ -48,9 +41,7 @@
     "type": "git",
     "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
-  "bugs": {
-    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
-  },
+  "bugs": { "url": "https://github.com/Azure/azure-sdk-for-js/issues" },
   "files": [
     "dist/**/*.js",
     "dist/**/*.js.map",
@@ -77,7 +68,7 @@
     "extract-api": "api-extractor run --local",
     "lint": "echo skipped",
     "audit": "echo skipped",
-    "clean": "echo skipped",
+    "clean": "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
     "build:node": "echo skipped",
     "build:browser": "echo skipped",
     "build:test": "echo skipped",
@@ -92,7 +83,7 @@
     "unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
     "unit-test:browser": "echo skipped",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
-    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts",
+    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
     "integration-test:browser": "echo skipped",
     "docs": "echo skipped"
   },
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_create_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_create_test.js
deleted file mode 100644
index 1ad377f8ab4e..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_create_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "37f0e73ac784b82cab4e3d0a7ce1bea4";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a2aedb0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AnI2ZCfa3hxNlIE6SF0AGfU; expires=Fri, 03-Dec-2021 09:46:14 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr3WAO6Z_9suqeT-UIzOQF8velBLNVmG8_vgDANhSNV0Qj7UhJLv-aRScXmGSodJdpVAmNPfaiJ_l6Cg-EBodLFGHHW3SK8h_HTs_Mbbcs9BBJGDm0cKCex8OqkOcTasNsBmmT-Em8etlr37XoBawldxAhkHsM1vyKLvx45AFskEcgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:14 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728a60820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=Ap5MTeMfGYxOrlGp0dEVQsw; expires=Fri, 03-Dec-2021 09:46:15 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrTp5d8JLLi0Nk_kvrLoAZbsSTIARe1PLkHtJWWgs3JYk6mCh3NOHurXLdEKC5XMkeJB-HkNlDEJP41oZiUPoGqMuQTFBIMQ2CW_AZNDv3-KP75uSHdRn0n4ENrnBkV5apx0jdvhNxOqfHXwNmNSxvkcw9JKE7946SE33CqypcXp8gAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:14 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=893d4e8b-d032-47a9-94d7-5a46751dc176&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'beeb6672-f285-407a-ac0e-c39d64860500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AgrzD5g2pTtBgoA0ZHoqxF8WPr5BAQAAAGdRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:15 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:14 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .put('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/exportPipelines/myexportpipelinexxx', {"location":"eastus","identity":{"type":"SystemAssigned"},"properties":{"target":{"type":"AzureStorageBlobContainer","uri":"https://accountname.blob.core.windows.net/containername","keyVaultUri":"https://myvault.vault.azure.net/secrets/acrexportsas"},"options":["OverwriteBlobs"]}})
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973377fb7aaeaf665b1ca4b6ad27c34faa8aca6595b544b82717afcfacd57afe9b362962fdba2bdfee8d12ffe685517cb69b1cacab31935d9dfc9cfb307f7f2ed87f73e9d6cef9f4fee6d4fb2d974fbd36c9adffb746feffe7e764000da7c992d5b7ee3c1def9c38383c9f9f6c1a7e7bbdbfbbbd9f9f6c3dd6cb2bd377b309dedeceece26fb0ff0860ca3b96eda7c71dc34c5c5329f7df44b800b7d7cb7594f9a695dac806973f721c1bc3f3b38dfbe37fdf401c1dcdb2798d307db07d3f31d823a39dfdbdfbd5be74db5aea7f9e775b55e357717d73f4da09bf6eeaaae2e69807573f796345b5ceb1fd7efdebdbbbeeed290be974f56fa09b5a2012db3050614ff5286f9346b3390785ae7599bcf9e10bd3f3acff61f64bbf776b6cfb3fbd3edfdd96467fbe1747a7f7b32fdf4fecefde9c1fe0326977de58dd0ed78b52a0b9d48fbed714bdfecedeced6eefee6eefdc7bb3f3f0d1fea78f76ef8f3ffd74677f7f6fef939d9d473b3bd4becc9af68b6a569c1700492fdd128bf0bd282a7e935be243934e73b4caeb96a80ffab4597d91d3bbf49b76f183759dbf6eab3abbc89f94d5c44e1f75b8ae0b6a316fdb55f3e8eedd6c3aadd6cb1693319e50cbf1b4aaf3f155b19c5557cd7899b777a7e65db4a1f7dfe6d73f99adcbf6ab00cee2fa121f8ee5df0cfdf3db4d4eb46e1beaa796796eb20603a884533f7af4bd8fbebcccebabba6819d3e6a3eff3e82e8b86be2f9617af5b9a29eae8f57a3acdf31978fe97","fc3f63337ce8d5030000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-writes',
-  '1194',
-  'x-ms-request-id',
-  'f78945cb-03bf-4588-9673-a50ae4bccd46',
-  'x-ms-correlation-request-id',
-  'f78945cb-03bf-4588-9673-a50ae4bccd46',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094616Z:f78945cb-03bf-4588-9673-a50ae4bccd46',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:16 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_delete_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_delete_test.js
deleted file mode 100644
index aeb733b39655..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_delete_test.js
+++ /dev/null
@@ -1,181 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "1bb72750a495cce818e8f95f55c8138a";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '561aaf9e-25b5-44db-9d11-585d47240500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AnwaP5PnMjlFh2n_mzzgUOs; expires=Fri, 03-Dec-2021 09:46:22 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrMbQwoltZ9EYEafN0Q9EAYXbZvO-YRLPh3Kd8EQWs6A0PPHyT2UaDh4gk_M23Ddbqg-n2U4jy7iGiSpP04-GKIJJTnVgUSsI2pHxnbh5bHwJhNums6WJkCDfHjTgq6WLT0-gYpMmlO-UdTKu_J2fPk2k_wD_PVKcNY7inFAUOe_cgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:22 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a2dbdb0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AiqVl6AFdvZMqObjv0WjoFM; expires=Fri, 03-Dec-2021 09:46:22 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevrl0Q6P9kgbPK06zeBTHL0VhNfzwS9GkFJM6y0hWQjewSKS9-INwHT_XHsCB3PwYo36m1kjYVO3t_hEsjnTVGMbIiYZh4ElEZn0oSMpUB9BgyOg9ika0hlUbBWYZwG7vLDHUH2JWvEZLHWcU0-rrbIySUHiIWcW16t1g82aZAG8mYgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:22 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=fcab5348-3b3f-4694-9c4f-b16919d4c95c&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d0d77e0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AqRFOKdzL89HnmHBLnwlfO4WPr5BAQAAAG5RFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:22 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:22 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .delete('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/exportPipelines/myexportpipelinexxx')
-  .query(true)
-  .reply(200, "", [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Expires',
-  '-1',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-deletes',
-  '14996',
-  'x-ms-request-id',
-  '4125d378-e45a-46bd-8751-596745c5b208',
-  'x-ms-correlation-request-id',
-  '4125d378-e45a-46bd-8751-596745c5b208',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094623Z:4125d378-e45a-46bd-8751-596745c5b208',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:22 GMT',
-  'Content-Length',
-  '0'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/exportPipelines')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef1479759b9ce3f7af4bdefff","92ff0742ea40440c000000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11978',
-  'x-ms-request-id',
-  '5959d29e-6043-4ef2-a9fb-f216003ae07a',
-  'x-ms-correlation-request-id',
-  '5959d29e-6043-4ef2-a9fb-f216003ae07a',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094623Z:5959d29e-6043-4ef2-a9fb-f216003ae07a',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:23 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_get_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_get_test.js
deleted file mode 100644
index 6cbe027d27f3..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_get_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "598afab8e3e1f28c163cbd5727cf41dc";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'beeb6672-f285-407a-ac0e-c39d74860500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AkFWaUYWNAtOkt8jn4LI2dQ; expires=Fri, 03-Dec-2021 09:46:18 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrSf3Ac9hfLQl4wKgZrHQUEnvVJ4_m2I9XeS96STEW8aHYfFL5ggvj9XaYEXX93G4VrnEjUYR_EV0Pmj-TOx8IoUAezj1Oi-OYN_oQNUxEH0hxh4tWrXsunWGm7Ok2FzIs-vOyhQyQaOe5POmyXDVCZaZ6SO3MQ5ud2JCJHgIMVDggAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:17 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '17dca5ec-0afc-442e-a44f-9ebbc4660500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AhuX99xuaTpPoa7ueRU-kAs; expires=Fri, 03-Dec-2021 09:46:18 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr_c1rtm8J_wdX7XL2RVN5JN4-h7A7AqzWTjl6_0LGtU70wdSzpB9MspduD9av3_V624RS25awVpdVBeZK5OKYVHzpvHQtZt5M50ZCObSA_38M0fVImuHdYZ2kGf5Rv6VPeEsenBsEf7ETmUxeewklKjb7_X0MMkkluP54jLQl-KwgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:18 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=bd1ad178-9ab9-42c3-89cb-3f8c928806f8&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '98a9be3f-6c46-4790-b1e1-32ad1a760600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AnIBJKN7zJ9Otxgn9lAJcLMWPr5BAQAAAGpRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:18 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:18 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/exportPipelines/myexportpipelinexxx')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973377fb7aaeaf665b1ca4b6ad27c34faa8aca6595b544b82717afcfacd57afe9b362962fdba2bdfee8d12ffe685517cb69b1cacab31935d9dfc9cfb307f7f2ed87f73e9d6cef9f4fee6d4fb2d974fbd36c9adffb746feffe7e764000da7c992d5b7ee3c1def9c38383c9f9f6c1a7e7bbdbfbbbd9f9f6c3dd6cb2bd377b309dedeceece26fb0ff0860ca3b96eda7c71dc34c5c5329f7df44b800b7d7cb7594f9a695dac806973f721c1bc3f3b38dfbe37fdf401c1dcdb2798d307db07d3f31d823a39dfdbdfbd5be74db5aea7f9e775b55e357717d73f4da09bf6eeaaae2e69807573f796345b5ceb1fd7efdebdbbbeeed290be974f56fa09b5a2012db3050614ff5286f9346b3390785ae7599bcf9e10bd3f3acff61f64bbf776b6cfb3fbd3edfdd96467fbe1747a7f7b32fdf4fecefde9c1fe0326977de58dd0ed78b52a0b9d48fbed714bdfecedeced6eefee6eefdc7bb3f3f0d1fea78f76ef8f3ffd74677f7f6fef939d9d473b3bd4becc9af68b6a569c1700492fdd128bf0bd282a7e935be243934e73b4caeb96a80ffab4597d91d3bbf49b76f183759dbf6eab3abbc89f94d5c44e1f75b8ae0b6a316fdb55f3e8eedd6c3aadd6cb1693319e50cbf1b4aaf3f155b19c5557cd7899b777a7e65db4a1f7dfe6d73f99adcbf6ab00cee2fa121f8ee5df0cfdf3db4d4eb46e1beaa796796eb20603a884533f7af4bd8fbebcccebabba6819d3e6a3eff3e82e8b86be2f9617af5b9a29eae8f57a3acdf31978fe97","fc3f63337ce8d5030000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11982',
-  'x-ms-request-id',
-  '925da43c-ad09-4311-ad34-bc94d0a2ba7b',
-  'x-ms-correlation-request-id',
-  '925da43c-ad09-4311-ad34-bc94d0a2ba7b',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094619Z:925da43c-ad09-4311-ad34-bc94d0a2ba7b',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:18 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_list_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_list_test.js
deleted file mode 100644
index 63fcd1ffd1cf..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_exportpipelines_list_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "690f8f43d7e93ffda1ef95a9b796ffa1";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '9f2a07e2-2a5f-4d52-857e-9dca14960500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AijRsg4rYzFKlIfjSt4hbo0; expires=Fri, 03-Dec-2021 09:46:20 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevro2Q8UwqZ5MkLNWWX8UK0Rpl-3Pv54jq9j3jxq3KRc_l3wfR1Q0q2hGs_dbLCHACA8KwkvSjnFoeLfSSVABst3ZS1DDTrhnOfgSZzbPTIxKhyD7bEnDGre6RT1JxDcJPWivDDeMxPTgMYt8e0m4am8Laa5Vr4mVwoVqeaX9yW7F4gAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:19 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '17dca5ec-0afc-442e-a44f-9ebbd4660500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AuBM6mf5vBhMkoucyT_0EMI; expires=Fri, 03-Dec-2021 09:46:20 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr4pUs_-mVwggU0CHqutRaxMPnqwQU3xdqj9S50MbT9rRYtAsqed82EdUQEoDmjuFb_nOhIyAcYlHxX5eW_Q5S6MivkI8NhF00KOm8587BqK-FJKvEIolu9gWGYTJVhLmoMI1TxlCSL-TAQgWJCxbVM10ojX_Kk4EWFqUlaBFp6eMgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:19 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=e5f1491a-2ff0-4257-a2e4-780442c430c8&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'fcd7eb22-1acf-4865-b1d2-d99b5e580500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=Aq74gtPTloBFnYSwk-ZbVoUWPr5BAQAAAGxRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:20 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:20 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/exportPipelines')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef1479759b9ce3f7af4bd5ffc517bbda25f3efaa298d655539db7e3936ad966c532af5fe51745d3d6d7776bf9a5c89bbbf9bb5555b72f8b555e5293e6a3d1476535cddaa25a128cd3e3d76fbe7a4d9f15b37cd916edf5478f7ef147abba584e8b55569ecda8c9fe4e7e9e3db8976f3fbcf7e9647bff7c726f7b92cda6db9f66d3fcdea77b7bf7f7b30302d0e6cb6cd9f21b0ff6ce1f1e1c4cceb70f3e3ddfdddedfcdceb71fee6693edbdd983e96c67777736d97f80376418cd75d3e68be3a6292e96f9eca35f025ce8e3bbcd7ad24ceb62054c9bbb0f09e6fdd9c1f9f6bde9a70f08e6de3ec19c3ed83e989eef10d4c9f9defeeedd3a6faa753dcd3fafabf5aab9bbb8fe6902ddb4775775754903ac9bbbb7a4d9e25affb87ef7eeddf5759786f4bd7cb2d24fa8150d68992d30a0f89732cca7599b81c4d33acfda7cf684e8fdd179b6ff20dbbdb7b37d9edd9f6eefcf263bdb0fa7d3fbdb93e9a7f777ee4f0ff61f30b9ec2b6f846ec7ab5559e844da6f8f5bfa666f676f777b77777be7de9b9d878ff63f7db47b7ffce9a73bfbfb7b7b9fecec3cdad9a1f665d6b45f54b3e2bc00487ae9965884ef4551f19bdc121f9a749aa3555eb7447dd0a7cdea8b9cdea5dfb48b1facebfc755bd5d945fea4ac2676faa8c3755d508b79dbae9a4777ef66d369b55eb6988cf1845a8ea7559d8faf8ae5acba6ac6cbbcbd3b35efa20dbdff36bffec96c5db65f057016d797f8702cff66e89fdf6e72a275db503fb5cc7393351840259c4a12fad19797797d55172d63da7cf47d1edd65d1d0f7c5f2e2754b33451dbd5e4fa7793e03cfff92efff","92ff0719272172e1030000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11980',
-  'x-ms-request-id',
-  'c862f5e9-2209-44c4-b622-c64d8eeca922',
-  'x-ms-correlation-request-id',
-  'c862f5e9-2209-44c4-b622-c64d8eeca922',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094621Z:c862f5e9-2209-44c4-b622-c64d8eeca922',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:20 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_create_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_create_test.js
deleted file mode 100644
index df068a20b2e0..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_create_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "deeed4807fa643a8e5b28edf5ee24183";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'beeb6672-f285-407a-ac0e-c39d44860500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=Av0XbrKt2jtLpW0RBDDMR4Y; expires=Fri, 03-Dec-2021 09:46:11 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrJzRXl3KOyGOx9FV1LYxz5SD7wUD9ykkj7vSFNCqweqV2a1AfwUWxmgtHz327_NPensVRJwbMRz_7bupKRz4tznY-kYkQE6Ew-REXvnD_gf3cs75YZA5bY4sOIUr2jD2axj54WWqWK6lf_x9zKONyPTl6Rf2D6rBMzWqKbUOEK44gAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:11 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '17dca5ec-0afc-442e-a44f-9ebb77660500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AhrSLetLHFtOtJhcDHwFGsI; expires=Fri, 03-Dec-2021 09:46:11 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrrSE8-FtC8Fh3QGZd0oR8wx_yEjdISDGDOTiQdm-BrGt2us2OnAZGewr5a4RhuVle2gA4zEKEh468nmXR10I4bk-IxuIslNlK8smuWkFP_K3PMezsWyJSqIpY7YSlKxJo99CsALYPywkLa9z5liqD3ckPZAsXTBrutzVnxLeaXSUgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:11 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=66ae45df-026c-4d54-b30f-533b86bfaee7&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728a39820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AlHgXynqhSVOp9wBfOX6klgWPr5BAQAAAGNRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:11 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:11 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .put('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/importPipelines/myimportpipelinexxx', {"location":"eastus","identity":{"type":"SystemAssigned"},"properties":{"source":{"type":"AzureStorageBlobContainer","uri":"https://accountname.blob.core.windows.net/containername","keyVaultUri":"https://myvault.vault.azure.net/secrets/acrimportsas"},"options":["OverwriteTags","DeleteSourceBlobOnSuccess","ContinueOnErrors"]}})
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973b758acaaba7d59acf2929a341f8d3e2aab69d616d592609c1ebf7ef3d56bfaac98e5cbb668af3f7af48b3f5ad5c5725aacb2f26c464df6ef3ffc74b6973ddcde3fc8a6dbfbf7ef4fb6279feededf7eb897657bf71eecdd9beeef1180365f66cb96df78b077fef0e06072be7df0e9f9eef6fe6e76befd70379b6cefcd1e4c673bbbbbb3c9fe03bc21c368ae9b365f1c374d71b1cc671ffd12e0421fdf6dd693665a172b60dadc7d4830efcf0eceb7ef4d3f7d4030f7f609e6f4c1f6c1f47c87a04ecef7f677efd67953adeb69fe795dad57cdddc5f54f13e8a6bdbbaaab4b1a60dddcbd25cd16d7fac7f5bb77efaeafbb34a4efe593957e42ad6840cb6c8101c5bf94613ecdda0c249ed679d6e6b32744ef8fceb3fd07d9eebd9dedf3ec3e117836d9d97e389ddedf9e4c3fbdbf737f7ab0ff80c9655f7923743b5eadca4227d27e7bdcd2377b3b7bbbdbbbbbdb3bf7deec3c7cb4ffe9a3ddbdf1debdfbfb3b9fee7fb2b3f3686787da9759d37e51cd8af30220e9a55b6211be1745c56f724b7c68d2698e5679dd12f5411f9947fca65c72fc83759dbf6eab3abbc89f94d5c44e1f75b8ae0b6a316fdb55f3e8eedd6c3aadd6cb1693319e50cbf1b4aaf3f155b19c5557cd7899b777a7e65db4a1f7dfe6d73f99adcbf6ab00cee2fa121f8ee5df0cfdf3db4d4eb46e1beaa796796eb2060320ceb9b8207c0867c1fe8df7419bb56b1ad847a7cb6c5282cbe9854a58fba347dffbe8cbcbbcbeaa8b367f935d40429fe665dee6af190c46fbe5f2f57a3acd1b7c879117cb75fee5f2b4aeabbaf9e8fb4cbccba22168c5f2e235f5058af11bf98c","3bfb7f001de0615f34040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-writes',
-  '1195',
-  'x-ms-request-id',
-  '46078c54-4342-4a2e-bd2b-9c4afb5ff322',
-  'x-ms-correlation-request-id',
-  '46078c54-4342-4a2e-bd2b-9c4afb5ff322',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094614Z:46078c54-4342-4a2e-bd2b-9c4afb5ff322',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:14 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_delete_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_delete_test.js
deleted file mode 100644
index e39ec2c8f299..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_delete_test.js
+++ /dev/null
@@ -1,181 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "95f476e462ae250a0b7203cf36e50346";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a2d2db0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AhGdJsaw_tVDorwlZpZG10o; expires=Fri, 03-Dec-2021 09:46:21 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrTDopBYGix0bneNcjPBeIIWMxu38YWTzNwAscHdS9Y10L0E2oeJ1ISnCugeWTOfjHBNdii6GFTnT4WfuIKCOo4Tf6qsK-InO1RiygB5RyaSTiwO81BMPxBwHW-b7PJoHnU04Myuw6mR4rDYC-z1eLlkXla53l3ukkvH0NlhQ1jOUgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:20 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728a8d820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AgYEp79fJWxGrIrFc4-vli0; expires=Fri, 03-Dec-2021 09:46:21 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevruswAM_vEJiXEnoXlX1nFhfcEKiRAHdiL0_y84dkpNdnafKAFN_lchtB-FlcqQoYo-7vJYyshkCAIHevDGtIXIkAq72CFzgwN7SilsIFSjKONF6QXoC_Woxp8BAxpamKwM8bW8HTq05oIxlH02ru-bmO_RVTYkDMWe2UHKM-tuGMgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:20 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=52069928-331a-4a58-a0a8-4f635aafc1e6&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d0cc7e0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=Anw48vYVNkFCq5nUgdTBmCoWPr5BAQAAAG1RFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:21 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:21 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .delete('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/importPipelines/myimportpipelinexxx')
-  .query(true)
-  .reply(200, "", [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Expires',
-  '-1',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-deletes',
-  '14997',
-  'x-ms-request-id',
-  'b9a3e8a9-f291-4e55-9463-7fd569c352f7',
-  'x-ms-correlation-request-id',
-  'b9a3e8a9-f291-4e55-9463-7fd569c352f7',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094622Z:b9a3e8a9-f291-4e55-9463-7fd569c352f7',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:21 GMT',
-  'Content-Length',
-  '0'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/importPipelines')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef1479759b9ce3f7af4bdefff","92ff0742ea40440c000000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11979',
-  'x-ms-request-id',
-  '51d17a35-2621-48b3-869b-cbe7665bba8c',
-  'x-ms-correlation-request-id',
-  '51d17a35-2621-48b3-869b-cbe7665bba8c',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094622Z:51d17a35-2621-48b3-869b-cbe7665bba8c',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:21 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_get_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_get_test.js
deleted file mode 100644
index c40eb5c7beab..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_get_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "48b6edfc408c755cac39ec112cb4b77e";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '9f2a07e2-2a5f-4d52-857e-9dcaff950500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AnMQgI1YCrlMn3G6leT7pe8; expires=Fri, 03-Dec-2021 09:46:17 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrlsPKjjQonfh1o5NumowjSlSCjT0JER-9nJz8GvzEoZ4nLRLrz5ywy7spz8J_8vNG9dBMIq5N-PU2FmZDfRfgJbatQtpyPuN8M8dhzFFhrJ3MoGAesXk3mO6Bt9Qb9fN5gUl_S9FlpVMP0ZspTNHq7cTPcwL6Na3a4CwbWhmPjJwgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:16 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '561aaf9e-25b5-44db-9d11-585d1d240500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AtzMjDM6Br1Jp6oAYXYVb00; expires=Fri, 03-Dec-2021 09:46:17 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr-VuS9UQyN2Zrw-SPNprTQPtJ3aNNOdJGBUBv40OpJbOcrcWXTmTiH0s2_3eFnRqjNHVMbZ5sleiqf9dV_Yq-3ceCv7wimDzj4RfdqHt4HvKi09CZDSFYcV7ER5teWYQLa7k8qFdXFGZtJQYNR5wFVC-cCsVbNAbvlPEkokDZsR4gAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:16 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=3a1b49f5-1ec3-4475-932d-70104053846b&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '17dca5ec-0afc-442e-a44f-9ebbb7660500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AvPnhYTRsJ5NhsZrm0C--jkWPr5BAQAAAGhRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:17 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:17 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/importPipelines/myimportpipelinexxx')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973b758acaaba7d59acf2929a341f8d3e2aab69d616d592609c1ebf7ef3d56bfaac98e5cbb668af3f7af48b3f5ad5c5725aacb2f26c464df6ef3ffc74b6973ddcde3fc8a6dbfbf7ef4fb6279feededf7eb897657bf71eecdd9beeef1180365f66cb96df78b077fef0e06072be7df0e9f9eef6fe6e76befd70379b6cefcd1e4c673bbbbbb3c9fe03bc21c368ae9b365f1c374d71b1cc671ffd12e0421fdf6dd693665a172b60dadc7d4830efcf0eceb7ef4d3f7d4030f7f609e6f4c1f6c1f47c87a04ecef7f677efd67953adeb69fe795dad57cdddc5f54f13e8a6bdbbaaab4b1a60dddcbd25cd16d7fac7f5bb77efaeafbb34a4efe593957e42ad6840cb6c8101c5bf94613ecdda0c249ed679d6e6b32744ef8fceb3fd07d9eebd9dedf3ec3e117836d9d97e389ddedf9e4c3fbdbf737f7ab0ff80c9655f7923743b5eadca4227d27e7bdcd2377b3b7bbbdbbbbbdb3bf7deec3c7cb4ffe9a3ddbdf1debdfbfb3b9fee7fb2b3f3686787da9759d37e51cd8af30220e9a55b6211be1745c56f724b7c68d2698e5679dd12f5411f9947fca65c72fc83759dbf6eab3abbc89f94d5c44e1f75b8ae0b6a316fdb55f3e8eedd6c3aadd6cb1693319e50cbf1b4aaf3f155b19c5557cd7899b777a7e65db4a1f7dfe6d73f99adcbf6ab00cee2fa121f8ee5df0cfdf3db4d4eb46e1beaa796796eb2060320ceb9b8207c0867c1fe8df7419bb56b1ad847a7cb6c5282cbe9854a58fba347dffbe8cbcbbcbeaa8b367f935d40429fe665dee6af190c46fbe5f2f57a3acd1b7c879117cb75fee5f2b4aeabbaf9e8fb4cbccba22168c5f2e235f5058af11bf98c","3bfb7f001de0615f34040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11983',
-  'x-ms-request-id',
-  '650c6f0e-a284-461e-954a-eec760b0d172',
-  'x-ms-correlation-request-id',
-  '650c6f0e-a284-461e-954a-eec760b0d172',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094618Z:650c6f0e-a284-461e-954a-eec760b0d172',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:17 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_list_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_list_test.js
deleted file mode 100644
index 453ef4ca58b5..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_importpipelines_list_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "b2eb479644b403de342c6dc257e1f896";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '561aaf9e-25b5-44db-9d11-585d2c240500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=ApnQl6akY4pKqRS5C_HosAo; expires=Fri, 03-Dec-2021 09:46:19 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrSqEBOhOEU7VTFEMNe-p-TZkqKc1OwXKvmpVUx2nfKKBEwlCEJT1CgaHU4oMvFgbtijXYrDRKf3nzANjIk3DPKGJKHuS4X9hf3zARumFFyT14MedUsD0Ah8xwF7peKlIs_V1PVh9Gs4sS5zxCavvz-TpePqhsDDeJIHNmkaVYpgkgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:18 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d0b57e0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AnK3rRL8xKlBpbwC2Mtp2os; expires=Fri, 03-Dec-2021 09:46:19 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevrj-MsHQEV0wl-D5NA_RVqwwFCoCujr6KjSRjM-CsD_LiQb1P0OF6qzulTontXuGX9raa59ty8NKVJtZkjHe-xv71jHh1s3wHpt5w5msVlTwbWQE7BAbia1b1BFDvJHB1Wx6CtkUpLQACYnU-tLNlzLYlzhXJpeA9pS6UCfNybO1ogAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:18 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=9b94c02a-76ae-48d4-9fa6-4f54d834b1e2&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '561aaf9e-25b5-44db-9d11-585d30240500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=Alecmtub5BVLn95BoYaC7OcWPr5BAQAAAGpRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:19 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:19 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/importPipelines')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef1479759b9ce3f7af4bd5ffc517bbda25f3efaa298d655539db7e3936ad966c532af5fe51745d3d6d7776bf9a5c89bbbc56255d5edcb629597d4a4f968f451594db3b6a89604e3f4f8f59baf5ed367c52c5fb6457bfdd1a35ffcd1aa2e96d362959567336ab27fffe1a7b3bdece1f6fe4136dddebf7f7fb23df974f7fef6c3bd2cdbbbf760efde747f8f00b4f9325bb6fcc683bdf387070793f3ed834fcf77b7f777b3f3ed87bbd9647b6ff6603adbd9dd9d4df61fe00d194673ddb4f9e2b8698a8b653efbe8970017faf86eb39e34d3ba5801d3e6ee4382797f7670be7d6ffae90382b9b74f30a70fb60fa6e73b047572beb7bf7bb7ce9b6a5d4ff3cfeb6abd6aee2eae7f9a4037eddd555d5dd200ebe6ee2d69b6b8d63faedfbd7b777ddda5217d2f9facf4136a45035a660b0c28fea50cf369d66620f1b4ceb3369f3d217a7f749eed3fc876efed6c9f67f789c0b3c9cef6c3e9f4fef664fae9fd9dfbd383fd074c2efbca1ba1dbf16a55163a91f6dbe396bed9dbd9dbdddedddddeb9f766e7e1a3fd4f1fedee8df7eedddfdff974ff939d9d473b3bd4becc9af68b6a569c1700492fdd128bf0bd282a7e935be243934e73b4caeb96a80ffac83ce237e592e31facebfc755bd5d945fea4ac2676faa8c3755d508b79dbae9a4777ef66d369b55eb6988cf1845a8ea7559d8faf8ae5acba6ac6cbbcbd3b35efa20dbdff36bffec96c5db65f057016d797f8702cff66e89fdf6e72a275db503fb5cc739335180071cec505e143380bf66fbc0fdaac5dd3c03e3a5d6693125c4e2f54c2da24d21f7d7999d75775d1e66fb20b48e8d3bcccdbfc3583c168bf5cbe5e4fa77983ef30f262b9cebf5c9ed67555371f7d9f8977593404ad585ebca6be40317e239f7167dfff25","ff0fd9bb11f540040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2019-12-01-preview, 2020-11-01-preview, 2021-06-01-preview, 2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11981',
-  'x-ms-request-id',
-  '9d03a84e-32bf-4ab6-9408-dcb07761b0b3',
-  'x-ms-correlation-request-id',
-  '9d03a84e-32bf-4ab6-9408-dcb07761b0b3',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094619Z:9d03a84e-32bf-4ab6-9408-dcb07761b0b3',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:19 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_registries_create_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_registries_create_test.js
deleted file mode 100644
index c923276bf46d..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_registries_create_test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "d754d51527d102fcb0c6320fb9fe4afa";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a244db0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AglzeoWyO8BKhtdALPUgUrs; expires=Fri, 03-Dec-2021 09:45:58 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrIBOX1GraaaHIw4-VVocXSXTrMGP4u2MWtvEasMoHYqNDEuSWEEyhvrmc_1sp-OY6Jc1Um89ueqfMlFVTmRSYY8it_Y0ayi-xwnesxnbydQSAY14q8oJeUOBH2VIOqIj5cOt6LCaMYa1pkG46ECqNVr3FnaXxSP58VvUMIIM5ZrMgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:45:57 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d0017e0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AsX2HWHA6f9Hp0Q5wEj6_r4; expires=Fri, 03-Dec-2021 09:45:58 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrhGotZVdGqgWbPdzmr70xW7R3r0JC9GDCqcvKNO13NcmIN6tzdLfgbabpdKF_2e7Ya4RmWfwroS8mrb5QRDepcgzoEXJifnRZYdDOXK1b1aGpWuh78NutGQDvPPI6FpX01ScvCL5rIq_Z6I8n_Q2M-ChKh98RZzVZndCR9PTBad4gAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:45:57 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=13daf320-cbf6-4ddc-b630-c26750d16c1d&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a24adb0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AoNLMTwQtgRIlP-lhC38wW4WPr5BAQAAAFZRFNkOAAAA; expires=Fri, 03-Dec-2021 09:45:58 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:45:58 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .put('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy', {"location":"eastus","tags":{"key":"value"},"sku":{"name":"Premium"},"properties":{"adminUserEnabled":false}})
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147cddbf5478f7ef147cb6c917ff4e8a39775be28d68b8f461fb5455e7b1ffc12fae47a85265f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147943108a19b5bedbac27cdb42e566d512d9bbb0ff7ce1fde9f1d9c6fdf9b7efa607b7f776f7ffbe1eef4c1f6c1f47ce7c1743639dfdbdfbd5be74db5aea7f9e775b55e357717d73fddb479d3de5dd5d56531cbebe6eeed70a037f58feb77efde5d5f134e3accfe176535cd80227d99674dbbc600daeca2016ddee6d7f4f16556ae73d0a1b92674164fb336c397d33acfda7cf6044dceb3fd07d9eebd9dedf3ecfe747b7f36d9d97e389ddedf9e4c3fbdbf737f7ab0ff60ff01c1b5afbc118a1eaf5665a1dddb6f8f5bfa666f676f777b77777be7de9b9d878ff63f7db4737ffc60effebd7b9fee7db2b3f3686787da9784ee17d5ac382f00925eba2516e17b5154fc26b7c487e843d3b4ca6be21f265e595d14cbd7797dc9ecd421fc38fbc1bacea7f5b8a8a83b1e39f54ca4052e1b3afb296a4ddd5c160d352f9617af5b79e5f57a3acdf3593ea3efb3d9a2587ed5e4f5e9329b94f4d1a3f3ac6c72e281bcbdaaeab7afd665fe3aa751fde28f66f979b62edbe3297a2730c765595d1188cba26ed759f9c2bd4043fadef789b557f60f0cb8229ae9707fd13aabb3654b1cf9129fd27c90881176c4508f3e9a158da0422fb5f5ba695d1b15ae17559bd5e0c7e83b75dee604bb5abaf766d935b57a2073f5d56a467498bd2998c9fbf47b38beb7fbe9ce83dd5d9dac816ef277abaaf670b38d72a5e42f41a3e5b4be66a90e9af8700899ec74395b55c5b2ed4e82ffddb7aba67d912d40401077551797340cf32d49f832e79931dfaf2784994eca314d78435f7c643a08e6f7c9f52a6b9a2f194d343a06bb81190b7a8b9afea05ae6aff2d97a39cb9618eb474f0dfac43fcb6a79bda8d6cdcb75591ae882fe2ff9","25ff0fe289350a38050000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'api-supported-versions',
-  '2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-writes',
-  '1196',
-  'x-ms-request-id',
-  '5355e9e0-f8cf-40de-8057-ab74351a81d7',
-  'x-ms-correlation-request-id',
-  '5355e9e0-f8cf-40de-8057-ab74351a81d7',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094611Z:5355e9e0-f8cf-40de-8057-ab74351a81d7',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:10 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_registries_delete_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_registries_delete_test.js
deleted file mode 100644
index 29aed43e1241..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_registries_delete_test.js
+++ /dev/null
@@ -1,143 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "365b3eff9526faf4e7f1e20dbd11562b";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '9f2a07e2-2a5f-4d52-857e-9dcaa9960500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=ApGezO7FhXRDmj3GdpaKzcw; expires=Fri, 03-Dec-2021 09:46:40 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrkZ2GV48kBuWAuWuMooBIDwisIh7SXd7Llw7kSg2de7gaeR5T5CPIyKlCGBmGtIRWWBZ5_LsqAxJ1-_mhURqNWPvWiKSSJxP-cbFBel4opKQG7gM4LhvNLqOqJu9u-lzXJ3uOCdgdL2X26zag4AsY1jkmeov1SfQLIZnPv2IpXsMgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:39 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'fcd7eb22-1acf-4865-b1d2-d99bef580500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AqKvw-Ii3PdLtnQjvgxeEfg; expires=Fri, 03-Dec-2021 09:46:40 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrkvAz9j5qt_0kMwvcFjM2jRfx9GP_FAMN1CjDt8aAWvknaY57TcA9YHCgNheZiQ2Rva8JlsRUJdXHJXM58413SjHQOQ8jWNUBJKJU7Bu8WCe1E7ZsghJKTCLcF7MelRarXh88YwEHbrvVZs28QGh8eld1R_2Zf-yJPGCKcxsxYksgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:39 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=1868084a-a4f0-4cb5-b0f5-d93ca006bff3&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d0757f0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AvoOfJ10fiRGv0ixMCtdFScWPr5BAQAAAH9RFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:40 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:40 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .delete('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy')
-  .query(true)
-  .reply(200, "", [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Expires',
-  '-1',
-  'api-supported-versions',
-  '2021-08-01-preview',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'Microsoft-HTTPAPI/2.0',
-  'x-ms-ratelimit-remaining-subscription-deletes',
-  '14994',
-  'x-ms-request-id',
-  'd4527032-e7a1-4cb8-acab-2baa8db893f6',
-  'x-ms-correlation-request-id',
-  'd4527032-e7a1-4cb8-acab-2baa8db893f6',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094646Z:d4527032-e7a1-4cb8-acab-2baa8db893f6',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:45 GMT',
-  'Content-Length',
-  '0'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_create_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_create_test.js
deleted file mode 100644
index ded300048922..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_create_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "c99415df90fe8363d69b304973445b4b";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a2ebdb0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AtPA65nVnEJNjSYTMpVqhMk; expires=Fri, 03-Dec-2021 09:46:23 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr5M8dqJBaeydbt_QWQKvyUmcuqTWfcxj93IpI0qyYCKIdXfOI003B8DJRkr7iJjiaJ1jz8XXiW8G5rRjFFij2qp27fPymXMAQMQix56HyLaRssr4KcTxfmlSRrHDT2rLRHpoUkfTW8IhH5fmGxXMNGsDG7qH3PxZB2VG0aTCxt9UgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:23 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d0e47e0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AooaPbFmzspBoP7_6qHoTIo; expires=Fri, 03-Dec-2021 09:46:24 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrwfJXr61iPmq6mqP2p0BK5ElN3drkXVODKAciWgzMzR-OR78Xh0BN3QxsUFtrPIVtJo0Szy-ULCTBGZVAzcMtEoJG9nnXvLtZrKdDoMeWrm-LIgJcvlbiDBRYilfqtFFZq-vkxeSB_ecKJ6OwMpIDBGrVkO60K-SsA0on-W1G3ksgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:23 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=4691f7f9-05c0-45af-b81a-15bdb9708819&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728aa0820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=Ao6_k1Ym1YBHrqZZI7NcxpUWPr5BAQAAAG9RFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:24 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:23 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .put('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/tasks/mytaskxxx', {"location":"eastus","tags":{"testkey":"value"},"properties":{"status":"Enabled","platform":{"os":"Linux","architecture":"amd64"},"agentConfiguration":{"cpu":2},"step":{"type":"Docker","contextPath":"https://github.com/SteveLasker/node-helloworld","imageNames":["testtask:v1"],"isPushEnabled":true,"noCache":false,"dockerFilePath":"DockerFile"},"trigger":{"baseImageTrigger":{"baseImageTriggerType":"Runtime","updateTriggerPayloadType":"Default","status":"Enabled","name":"myBaseImageTrigger"}}}})
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973b7cd9ab7cd47a38f5675b5caeb963efae8d12fc65f97455354cb6279f1bacd5a007cbd9e4ef37c96cfa8f5b4ceb396be7e2a5fededeced6eefee6eefdc7bb3f3f0d1fea78ff60ec69fee1decee7ffae9273b3b8f7676e89586c0ac09f847a7cb6c5232945599b5e755bd408f15be7a5e2cd7efe88bac9ece8b369fb6eb1ae0b3c5ecd3fd8f7e097d7e912f5b1ace7971b1ae1901bc3a5dad3f7ab4475fb7c522afd6ed478fee7dbab3831ef315be57823cada66ff39aa0170b82f3225b60a8dffba8cd9b16447874b9fbd1f7e9cbe6e5ba991b1c1fb5f53a1f7db4ac4eb2e99c809c6765437fcf18d4b3a2cc5f66eddcc2c607047f4af4cedfb5fad5bc6d57cda3bb772f8a76be9e8ca7d5e2eeeb36bfcc9f539f797d7759cdf2ed795e96d5555597338c9226e6e2823025d42759939f01dd37c39fbd91e1bd5a2f317eea7fbd9ad1b4e8b72fb3ebb2ca66dae8697e9eadcb961a45a6634924a10f16d74f3a3d7cf44b7e09a15510393ebadbac27cdb42e56207e73f7e1def9c3fbb383f3ed7bd34f1f6cefefeeed6f3fdc9d3ed83e989eef3c98ce26e77bfbbb77ebbca9d6f534ffbcaed6abe6eee2faa769669af62e33d92caf9bbbb7e4d5c5b5fe71fdeeddbbeb6be15dfa143fe9137f08eea336bba061121750976ff36bfaf6322bd739085d565365a28ff2ac0139882ed784dc82f83ac34bcce7f9ec095e3bcff61f64bbf776b6cfb3fbd3edfdd96467fbe1747a7f7b32fdf4fecefde9c1fe83fd0704c0bea2243f5eadca42fbb1df1e139346a4e6c1f8d3ddfbf73ffdf4a1959a92f0faa29a15e70540d24bb7c4227c2f8a8adfe496f8fc925f","f2ff006a308dc45f040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding,Accept-Encoding',
-  'x-ms-correlation-request-id',
-  'ee757b04-d487-49b5-940a-9fb837f66943',
-  'x-ms-ratelimit-remaining-subscription-writes',
-  '1193',
-  'x-ms-request-id',
-  'c682ce30-12f4-409a-853e-97723200568a',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'nginx/1.15.10',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094630Z:ee757b04-d487-49b5-940a-9fb837f66943',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:29 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_delete_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_delete_test.js
deleted file mode 100644
index 56b074ed53e2..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_delete_test.js
+++ /dev/null
@@ -1,177 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "8b2200cae94dd055808ee64033a74953";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728af8820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AjVhNvg1s2hPsPyv7nRdoRQ; expires=Fri, 03-Dec-2021 09:46:35 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrIkaMB9I-JPI14NRGa2bDehUIr1rE7Erpi_FHBH2x6ilFVsv1XLmgJ9bXf-uv50Cs55id7eG2gX8eVwMUVR5dkSn4hY0qKRO92Hr5MInfG70IfBU8vzxNOJUeF5Nb1itRlStGJg7hG-0bPbG_P6rUtLDg41tg6DtZdkbAoORsnQYgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:35 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'c62deb8d-f9b3-498a-868e-f4d04d7f0600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AvAIB3rNivBIv5_8a_9E8RI; expires=Fri, 03-Dec-2021 09:46:35 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrKXu7SatwtCtoDmS4z_InmNw2LmCk2GxBxUu0nIRHh7FpG09hM0qBGTMleLRCdz02KJ6ITWFBwEgHIdB0mzu14VlGf6ZhxVuzJE8-qaOS2IziZSo8y5bjQGljMQfeh06y9yjfB4Eq41Ce_hen5isTmlNhVIOrk-o1m_twW3dNgSogAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:35 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=88a79d77-d0b9-4bb9-82c6-b7d3b3f48fd9&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '9f2a07e2-2a5f-4d52-857e-9dca87960500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=Aj_2ap7s4PZBt5E3ee5-degWPr5BAQAAAHtRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:36 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:35 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .delete('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/tasks/mytaskxxx')
-  .query(true)
-  .reply(200, "", [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Expires',
-  '-1',
-  'x-ms-ratelimit-remaining-subscription-deletes',
-  '14995',
-  'x-ms-request-id',
-  'b7f68723-8e47-44a3-b88a-2d798bffa39a',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'nginx/1.15.10',
-  'x-ms-correlation-request-id',
-  '78d4f24b-c7a2-406b-9a06-7786c4812e1f',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094639Z:78d4f24b-c7a2-406b-9a06-7786c4812e1f',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:38 GMT',
-  'Content-Length',
-  '0'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/tasks')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef1479759b9ce3f7af4bdefff","92ff0742ea40440c000000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11975',
-  'x-ms-request-id',
-  '643c39ce-de6e-4d65-90d8-377b4d955b68',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'nginx/1.15.10',
-  'x-ms-correlation-request-id',
-  '35f6efe1-76ea-47ce-b46d-a6d45702cbb6',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094639Z:35f6efe1-76ea-47ce-b46d-a6d45702cbb6',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:39 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_get_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_get_test.js
deleted file mode 100644
index 607b9a402e14..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_get_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "35b72c150c83efc2ced6929d047bd46b";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728ace820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=AjWFFGjCkYlAqhmk-BXangU; expires=Fri, 03-Dec-2021 09:46:30 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7Wevr_ktUJV4haJ5Agl_F3WcttJXefGJtTX_pROwZje51H5sRLTyzMxBDAA4FXXZIXJs7vmHk09PfHiGpGRCU57MUSbi_me9G1kmyyhx0PfY_G0RNHcCaMN7y_Hn4C3lhVtT9O1vufJmwx4qyje1OuPz3jKQ-5UKt3vgDyqJVQj_xEoogAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:30 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728ad4820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=Aie4bnVGGNdNuD_HJrxyzA4; expires=Fri, 03-Dec-2021 09:46:30 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrIoehhWZ2nroxEL9gUGqMgzmpZixqEaYVR8XdgDGqjO7plmotXK1F415JFlNK7RxBkV9QwF6oesAZ1umU8D2s3gN-2pwKRbDXO_rMFLwZzV0vmZjGc5Z_IQyZRyMSY9ac66_HF71LH1yBoShy0i9xJKJxS8V8z9l04YoIhj5jM7cgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:30 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=31eda9dd-1c02-4820-adc1-74f862d19bad&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'edf2b598-6436-4d5a-afcb-728ad6820500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR1 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AuYHJF9nlBxJnMh0doOaOzMWPr5BAQAAAHZRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:31 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:30 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/tasks/mytaskxxx')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973b7cd9ab7cd47a38f5675b5caeb963efae8d12fc65f97455354cb6279f1bacd5a007cbd9e4ef37c96cfa8f5b4ceb396be7e2a5fededeced6eefee6eefdc7bb3f3f0d1fea78ff60ec69fee1decee7ffae9273b3b8f7676e89586c0ac09f847a7cb6c5232945599b5e755bd408f15be7a5e2cd7efe88bac9ece8b369fb6eb1ae0b3c5ecd3fd8f7e097d7e912f5b1ace7971b1ae1901bc3a5dad3f7ab4475fb7c522afd6ed478fee7dbab3831ef315be57823cada66ff39aa0170b82f3225b60a8dffba8cd9b16447874b9fbd1f7e9cbe6e5ba991b1c1fb5f53a1f7db4ac4eb2e99c809c6765437fcf18d4b3a2cc5f66eddcc2c607047f4af4cedfb5fad5bc6d57cda3bb772f8a76be9e8ca7d5e2eeeb36bfcc9f539f797d7759cdf2ed795e96d5555597338c9226e6e2823025d42759939f01dd37c39fbd91e1bd5a2f317eea7fbd9ad1b4e8b72fb3ebb2ca66dae8697e9eadcb961a45a6634924a10f16d74f3a3d7cf44b7e09a15510393ebadbac27cdb42e56207e73f7e1def9c3fbb383f3ed7bd34f1f6cefefeeed6f3fdc9d3ed83e989eef3c98ce26e77bfbbb77ebbca9d6f534ffbcaed6abe6eee2faa769669af62e33d92caf9bbbb7e4d5c5b5fe71fdeeddbbeb6be15dfa143fe9137f08eea336bba061121750976ff36bfaf6322bd739085d565365a28ff2ac0139882ed784dc82f83ac34bcce7f9ec095e3bcff61f64bbf776b6cfb3fbd3edfdd96467fbe1747a7f7b32fdf4fecefde9c1fe83fd0704c0bea2243f5eadca42fbb1df1e139346a4e6c1f8d3ddfbf73ffdf4a1959a92f0faa29a15e70540d24bb7c4227c2f8a8adfe496f8fc925f","f2ff006a308dc45f040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding,Accept-Encoding',
-  'x-ms-correlation-request-id',
-  'c8ea8e9c-9577-4f07-b76f-09bd2b2942a7',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11977',
-  'x-ms-request-id',
-  '45c44e61-d617-4e42-aea2-d0957cb97992',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'nginx/1.15.10',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094631Z:c8ea8e9c-9577-4f07-b76f-09bd2b2942a7',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:30 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_list_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_list_test.js
deleted file mode 100644
index fe9f253ed657..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_list_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "fd12cc7ebda641aea994a48c55503671";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '561aaf9e-25b5-44db-9d11-585d89240500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AlCIf3eR4V1Gvusl230lh-U; expires=Fri, 03-Dec-2021 09:46:31 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevruDlpEi9ExGlfBpeK60Em4Tc_3Le1W3oXnpu1Y2WwjhYk5YZJ--goQYldDkRAI5FCOABUN_yZDThth6y4ZqclysDLHzCckFJCiaxgDKh7AckABm5tQSJHliaTHcnO0iX8oXtRGD0JaCfWt-hPtXBR5WyOE59awnBfMeaCvSbRejMgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:31 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '17dca5ec-0afc-442e-a44f-9ebb56670500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=Atqyz4EPtoZAgHEc3gf8kLc; expires=Fri, 03-Dec-2021 09:46:31 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevriCLNt-ZWPVQVPxMLWWmwvU8zFPNpWzAHbTMFdQlm3_5-p_CibND7cfj75tpB31zPSqgszzxv86BBxinOWw6eu0BJ4trvP349eZ0izlKzpKRZR4IK85FWTiHAPQwKYYK3gRgu_z_q3cOO-h1S6esRBx4E-2770hGiORgKei587FIgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:31 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=e89cfa22-b01d-4fcd-b2f5-e3c779741f91&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '17dca5ec-0afc-442e-a44f-9ebb5b670500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - SEASLR2 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=Ao9Wz7mMJ0RJljJp6h6RQjoWPr5BAQAAAHdRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:32 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:31 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .get('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/tasks')
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef1479759b9ce3f7af4bd5ffc517bbda25f3efaa298d655539db7e3936ad966c532af5fe51745d3d6d7776bf9a5c89bbb6dd6bc6d3e1a7db4aaab555eb7f4d1478f7e31feba2c9aa25a16cb8bd76dd602e0ebf5749ae7b37c46ada7759eb5f4f553f96a6f676f777b77777be7de9b9d878ff63f7db47730fe74ef6077ffd34f3fd9d979b4b343af3404664dc03f3a5d669392a1accaac3dafea057aacf0d5f362b97e475f64f5745eb4f9b45dd7009f2d669fee7ff44be8f38b7cd9d270ce8b8b75cd08e0d5e96afdd1a33dfaba2d1679b56e3f7a74efd39d1df498aff0bd12e469357d9bd704bd58109c17d90243fdde476ddeb420c2a3cbdd8fbe4f5f362fd7cddce0f8a8add7f9e8a36575924de704e43c2b1bfa7bc6a09e1565fe326be716363e20f853a277feaed5afe66dbb6a1eddbd7b51b4f3f5643cad16775fb7f965fe9cfaccebbbcb6a966fcff3b2acaeaaba9c6194343117178429a13ec99afc0ce8be19feec8d0cefd57a89f153ffebd58ca645bf7d995d975536d3464ff3f36c5db6d428321d4b22097db0b87ed2e9e1a35ff24b08ad82c8f1d1dd663d69a675b102f19bbb0ff7ce1fde9f1d9c6fdf9b7efa607b7f776f7ffbe1eef4c1f6c1f47ce7c1743639dfdbdfbd5be74db5aea7f9e775b55e357717d73f4d33d3b47799c96679dddcbd25af2eaef58feb77efde5d5f0befd2a7f8499ff843701fb5d9050d93b880ba7c9b5fd3b7222a34a2b29a2a137d94670dc84174b926e416c4d7195e623ecf674ff0da79b6ff20dbbdb7b37d9edd9f6eefcf263bdb0fa7d3fbdb93e9a7f777ee4f0ff61fec3f2000f61525f9f16a5516da8ffdf698983422350fc69feedebfffe9a70fadd49484d717d5ac382f00925eba2516e17b5154fc26b7c4e797fc92efff","92ff0737be51976b040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding,Accept-Encoding',
-  'x-ms-correlation-request-id',
-  '84261ba0-d2ff-4bce-ac56-7c612bbb2b30',
-  'x-ms-ratelimit-remaining-subscription-reads',
-  '11976',
-  'x-ms-request-id',
-  'fb5fb3f0-e8bb-4d91-817c-7ab2f506571f',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'nginx/1.15.10',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094632Z:84261ba0-d2ff-4bce-ac56-7c612bbb2b30',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:31 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_update_test.js b/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_update_test.js
deleted file mode 100644
index d9443766c0f4..000000000000
--- a/sdk/containerregistry/arm-containerregistry/recordings/node/containerregistry_test/recording_tasks_update_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-let nock = require('nock');
-
-module.exports.hash = "7928509648f5912bab50b114d6bc4931";
-
-module.exports.testInfo = {"uniqueName":{},"newDate":{}}
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/common/discovery/instance')
-  .query(true)
-  .reply(200, {"tenant_discovery_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration","api-version":"1.1","metadata":[{"preferred_network":"login.microsoftonline.com","preferred_cache":"login.windows.net","aliases":["login.microsoftonline.com","login.windows.net","login.microsoft.com","sts.windows.net"]},{"preferred_network":"login.partner.microsoftonline.cn","preferred_cache":"login.partner.microsoftonline.cn","aliases":["login.partner.microsoftonline.cn","login.chinacloudapi.cn"]},{"preferred_network":"login.microsoftonline.de","preferred_cache":"login.microsoftonline.de","aliases":["login.microsoftonline.de"]},{"preferred_network":"login.microsoftonline.us","preferred_cache":"login.microsoftonline.us","aliases":["login.microsoftonline.us","login.usgovcloudapi.net"]},{"preferred_network":"login-us.microsoftonline.com","preferred_cache":"login-us.microsoftonline.com","aliases":["login-us.microsoftonline.com"]}]}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '98a9be3f-6c46-4790-b1e1-32ad9d760600',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR1 ProdSlices',
-  'Set-Cookie',
-  'fpc=Ar7LsXJtkE5MgDw0fQlUC9E; expires=Fri, 03-Dec-2021 09:46:32 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrHBE706ceK0h6lRWA_7gX8ZPmjaTorPKPIjy93MLa1oj1xZs1DoQIdmRW1yHDF5ab0d3x9I-yM5I6GY1T5JCjmFSCS7j2smLOpPIhI82RQ2LCJVfU3HsofebBXk8CYBDaCkGVAFMSVEmd-Z1Q6OeUL13fa0XUfo9wNc7qFFxvOZ4gAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:32 GMT',
-  'Content-Length',
-  '980'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .get('/88888888-8888-8888-8888-888888888888/v2.0/.well-known/openid-configuration')
-  .reply(200, {"token_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token","token_endpoint_auth_methods_supported":["client_secret_post","private_key_jwt","client_secret_basic"],"jwks_uri":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/discovery/v2.0/keys","response_modes_supported":["query","fragment","form_post"],"subject_types_supported":["pairwise"],"id_token_signing_alg_values_supported":["RS256"],"response_types_supported":["code","id_token","code id_token","id_token token"],"scopes_supported":["openid","profile","email","offline_access"],"issuer":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/v2.0","request_uri_parameter_supported":false,"userinfo_endpoint":"https://graph.microsoft.com/oidc/userinfo","authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/authorize","device_authorization_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/devicecode","http_logout_supported":true,"frontchannel_logout_supported":true,"end_session_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/oauth2/v2.0/logout","claims_supported":["sub","iss","cloud_instance_name","cloud_instance_host_name","cloud_graph_host_name","msgraph_host","aud","exp","iat","auth_time","acr","nonce","preferred_username","name","tid","ver","at_hash","c_hash","email"],"kerberos_endpoint":"https://login.microsoftonline.com/88888888-8888-8888-8888-888888888888/kerberos","tenant_region_scope":"WW","cloud_instance_name":"microsoftonline.com","cloud_graph_host_name":"graph.windows.net","msgraph_host":"graph.microsoft.com","rbac_url":"https://pas.windows.net"}, [
-  'Cache-Control',
-  'max-age=86400, private',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Access-Control-Allow-Origin',
-  '*',
-  'Access-Control-Allow-Methods',
-  'GET, OPTIONS',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  '561aaf9e-25b5-44db-9d11-585d91240500',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'Set-Cookie',
-  'fpc=AgKtyVZWKuNMkNgXHd1a6Oo; expires=Fri, 03-Dec-2021 09:46:32 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'esctx=AQABAAAAAAD--DLA3VO7QrddgJg7WevrvWb_IcZuzj1yAud3EkRU45bwlWG5qDlhOvUWUFtuQEKUGCHLnaDbDmT6xIlJnqRhu_ETeK5NVr8254abbTe1LVvqrDG3OVxGaAGBI2IHwtzm7x7XhmgVdqxPW2xd6VWEAut6rIeKEaZHrwywYuNjh24XbmSMITlliprluLzqzHcgAA; domain=.login.microsoftonline.com; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:32 GMT',
-  'Content-Length',
-  '1753'
-]);
-
-nock('https://login.microsoftonline.com:443', {"encodedQueryParams":true})
-  .post('/88888888-8888-8888-8888-888888888888/oauth2/v2.0/token', "client_id=azure_client_id&scope=https%3A%2F%2Fsanitized%2F&grant_type=client_credentials&x-client-SKU=msal.js.node&x-client-VER=1.3.2&x-client-OS=win32&x-client-CPU=x64&x-ms-lib-capability=retry-after, h429&x-client-current-telemetry=5|771,2,,,|,&x-client-last-telemetry=5|0|||0,0&client-request-id=193f53a0-7e9c-4c5f-9f19-6fd57a8333e0&client_secret=azure_client_secret&claims=%7B%22access_token%22%3A%7B%22xms_cc%22%3A%7B%22values%22%3A%5B%22CP1%22%5D%7D%7D%7D")
-  .reply(200, {"token_type":"Bearer","expires_in":86399,"ext_expires_in":86399,"access_token":"access_token"}, [
-  'Cache-Control',
-  'no-store, no-cache',
-  'Pragma',
-  'no-cache',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Expires',
-  '-1',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'X-Content-Type-Options',
-  'nosniff',
-  'P3P',
-  'CP="DSP CUR OTPi IND OTRi ONL FIN"',
-  'x-ms-request-id',
-  'd4101ec2-ba9d-4bf0-b788-a4a232dc0400',
-  'x-ms-ests-server',
-  '2.1.12197.4 - KRSLR2 ProdSlices',
-  'x-ms-clitelem',
-  '1,0,0,,',
-  'Set-Cookie',
-  'fpc=AnZE_qYN8rdPi-acgn-FHo8WPr5BAQAAAHhRFNkOAAAA; expires=Fri, 03-Dec-2021 09:46:33 GMT; path=/; secure; HttpOnly; SameSite=None',
-  'Set-Cookie',
-  'x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly',
-  'Set-Cookie',
-  'stsservicecookie=estsfd; path=/; secure; samesite=none; httponly',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:32 GMT',
-  'Content-Length',
-  '1351'
-]);
-
-nock('https://management.azure.com:443', {"encodedQueryParams":true})
-  .patch('/subscriptions/azure_subscription_id/resourceGroups/myjstest/providers/Microsoft.ContainerRegistry/registries/myregistryxxxyy/tasks/mytaskxxx', {"tags":{"testkey":"value"},"properties":{"status":"Enabled","platform":{"os":"Linux","architecture":"amd64"},"agentConfiguration":{"cpu":2},"step":{"type":"Docker","contextPath":"https://github.com/SteveLasker/node-helloworld","imageNames":["testtask:v1"],"isPushEnabled":true,"noCache":false,"dockerFilePath":"DockerFile"},"trigger":{"baseImageTrigger":{"baseImageTriggerType":"Runtime","updateTriggerPayloadType":"Default","status":"Enabled","name":"myBaseImageTrigger"}}}})
-  .query(true)
-  .reply(200, ["1f8b0800000000000400edbd07601c499625262f6dca7b7f4af54ad7e074a10880601324d8904010ecc188cde692ec1d69472329ab2a81ca6556655d661640cced9dbcf7de7befbdf7de7befbdf7ba3b9d4e27f7dfff3f5c6664016cf6ce4adac99e2180aac81f3f7e7c1f3f227ef147edf52affe8d1475f14d3ba6aaaf3767c522ddbac58e6f5abfca268dafafa6e2dbf147973b7cd9ab7cd47a38f5675b5caeb963efae8d12fc65f97455354cb6279f1bacd5a007cbd9e4ef37c96cfa8f5b4ceb396be7e2a5fededeced6eefee6eefdc7bb3f3f0d1fea78ff60ec69fee1decee7ffae9273b3b8f7676e89586c0ac09f847a7cb6c5232945599b5e755bd408f15be7a5e2cd7efe88bac9ece8b369fb6eb1ae0b3c5ecd3fd8f7e097d7e912f5b1ace7971b1ae1901bc3a5dad3f7ab4475fb7c522afd6ed478fee7dbab3831ef315be57823cada66ff39aa0170b82f3225b60a8dffba8cd9b16447874b9fbd1f7e9cbe6e5ba991b1c1fb5f53a1f7db4ac4eb2e99c809c6765437fcf18d4b3a2cc5f66eddcc2c607047f4af4cedfb5fad5bc6d57cda3bb772f8a76be9e8ca7d5e2eeeb36bfcc9f539f797d7759cdf2ed795e96d5555597338c9226e6e2823025d42759939f01dd37c39fbd91e1bd5a2f317eea7fbd9ad1b4e8b72fb3ebb2ca66dae8697e9eadcb961a45a6634924a10f16d74f3a3d7cf44b7e09a15510393ebadbac27cdb42e56207e73f7e1def9c3fbb383f3ed7bd34f1f6cefefeeed6f3fdc9d3ed83e989eef3c98ce26e77bfbbb77ebbca9d6f534ffbcaed6abe6eee2faa769669af62e33d92caf9bbbb7e4d5c5b5fe71fdeeddbbeb6be15dfa143fe9137f08eea336bba061121750976ff36bfaf6322bd739085d565365a28ff2ac0139882ed784dc82f83ac34bcce7f9ec095e3bcff61f64bbf776b6cfb3fbd3edfdd96467fbe1747a7f7b32fdf4fecefde9c1fe83fd0704c0bea2243f5eadca42fbb1df1e139346a4e6c1f8d3ddfbf73ffdf4a1959a92f0faa29a15e70540d24bb7c4227c2f8a8adf248ecfbd7be3879fee7c7aefd3078acf2ff9","25ff0f144a2fb25f040000"], [
-  'Cache-Control',
-  'no-cache',
-  'Pragma',
-  'no-cache',
-  'Transfer-Encoding',
-  'chunked',
-  'Content-Type',
-  'application/json; charset=utf-8',
-  'Content-Encoding',
-  'gzip',
-  'Expires',
-  '-1',
-  'Vary',
-  'Accept-Encoding,Accept-Encoding',
-  'x-ms-correlation-request-id',
-  '63f370ba-6edf-46ee-b7a3-604b74c6fdc0',
-  'x-ms-ratelimit-remaining-subscription-writes',
-  '1192',
-  'x-ms-request-id',
-  'f4e3871b-00e6-4f77-b46c-b983d06a36e7',
-  'X-Content-Type-Options',
-  'nosniff',
-  'Strict-Transport-Security',
-  'max-age=31536000; includeSubDomains',
-  'Server',
-  'nginx/1.15.10',
-  'x-ms-routing-request-id',
-  'SOUTHEASTASIA:20211103T094635Z:63f370ba-6edf-46ee-b7a3-604b74c6fdc0',
-  'Date',
-  'Wed, 03 Nov 2021 09:46:34 GMT'
-]);
diff --git a/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md b/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md
index dbcf0c3af457..eaec108ff1c0 100644
--- a/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md
+++ b/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md
@@ -16,20 +16,6 @@ export type Action = string;
 // @public
 export type ActionsRequired = string;
 
-// @public
-export interface ActivationProperties {
-    readonly status?: ActivationStatus;
-}
-
-// @public
-export type ActivationStatus = string;
-
-// @public
-export interface ActiveDirectoryObject {
-    objectId?: string;
-    tenantId?: string;
-}
-
 // @public
 export interface Actor {
     name?: string;
@@ -143,9 +129,6 @@ export interface Argument {
     value: string;
 }
 
-// @public
-export type AuditLogStatus = string;
-
 // @public
 export interface AuthInfo {
     expiresIn?: number;
@@ -205,131 +188,19 @@ export interface CallbackConfig {
     serviceUri: string;
 }
 
-// @public
-export type CertificateType = string;
-
-// @public
-export interface ConnectedRegistries {
-    beginCreate(resourceGroupName: string, registryName: string, connectedRegistryName: string, connectedRegistryCreateParameters: ConnectedRegistry, options?: ConnectedRegistriesCreateOptionalParams): Promise<PollerLike<PollOperationState<ConnectedRegistriesCreateResponse>, ConnectedRegistriesCreateResponse>>;
-    beginCreateAndWait(resourceGroupName: string, registryName: string, connectedRegistryName: string, connectedRegistryCreateParameters: ConnectedRegistry, options?: ConnectedRegistriesCreateOptionalParams): Promise<ConnectedRegistriesCreateResponse>;
-    beginDeactivate(resourceGroupName: string, registryName: string, connectedRegistryName: string, options?: ConnectedRegistriesDeactivateOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeactivateAndWait(resourceGroupName: string, registryName: string, connectedRegistryName: string, options?: ConnectedRegistriesDeactivateOptionalParams): Promise<void>;
-    beginDelete(resourceGroupName: string, registryName: string, connectedRegistryName: string, options?: ConnectedRegistriesDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeleteAndWait(resourceGroupName: string, registryName: string, connectedRegistryName: string, options?: ConnectedRegistriesDeleteOptionalParams): Promise<void>;
-    beginUpdate(resourceGroupName: string, registryName: string, connectedRegistryName: string, connectedRegistryUpdateParameters: ConnectedRegistryUpdateParameters, options?: ConnectedRegistriesUpdateOptionalParams): Promise<PollerLike<PollOperationState<ConnectedRegistriesUpdateResponse>, ConnectedRegistriesUpdateResponse>>;
-    beginUpdateAndWait(resourceGroupName: string, registryName: string, connectedRegistryName: string, connectedRegistryUpdateParameters: ConnectedRegistryUpdateParameters, options?: ConnectedRegistriesUpdateOptionalParams): Promise<ConnectedRegistriesUpdateResponse>;
-    get(resourceGroupName: string, registryName: string, connectedRegistryName: string, options?: ConnectedRegistriesGetOptionalParams): Promise<ConnectedRegistriesGetResponse>;
-    list(resourceGroupName: string, registryName: string, options?: ConnectedRegistriesListOptionalParams): PagedAsyncIterableIterator<ConnectedRegistry>;
-}
-
-// @public
-export interface ConnectedRegistriesCreateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type ConnectedRegistriesCreateResponse = ConnectedRegistry;
-
-// @public
-export interface ConnectedRegistriesDeactivateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface ConnectedRegistriesDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface ConnectedRegistriesGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ConnectedRegistriesGetResponse = ConnectedRegistry;
-
-// @public
-export interface ConnectedRegistriesListNextOptionalParams extends coreClient.OperationOptions {
-    filter?: string;
-}
-
-// @public
-export type ConnectedRegistriesListNextResponse = ConnectedRegistryListResult;
-
-// @public
-export interface ConnectedRegistriesListOptionalParams extends coreClient.OperationOptions {
-    filter?: string;
-}
-
-// @public
-export type ConnectedRegistriesListResponse = ConnectedRegistryListResult;
-
-// @public
-export interface ConnectedRegistriesUpdateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type ConnectedRegistriesUpdateResponse = ConnectedRegistry;
-
-// @public
-export type ConnectedRegistry = ProxyResource & {
-    readonly provisioningState?: ProvisioningState;
-    mode?: ConnectedRegistryMode;
-    readonly version?: string;
-    readonly connectionState?: ConnectionState;
-    readonly lastActivityTime?: Date;
-    readonly activation?: ActivationProperties;
-    parent?: ParentProperties;
-    clientTokenIds?: string[];
-    loginServer?: LoginServerProperties;
-    logging?: LoggingProperties;
-    readonly statusDetails?: StatusDetailProperties[];
-    notificationsList?: string[];
-};
-
-// @public
-export interface ConnectedRegistryListResult {
-    nextLink?: string;
-    value?: ConnectedRegistry[];
-}
-
-// @public
-export type ConnectedRegistryMode = string;
-
-// @public
-export interface ConnectedRegistryUpdateParameters {
-    clientTokenIds?: string[];
-    logging?: LoggingProperties;
-    notificationsList?: string[];
-    syncProperties?: SyncUpdateProperties;
-}
-
-// @public
-export type ConnectionState = string;
-
 // @public
 export type ConnectionStatus = string;
 
 // @public (undocumented)
-export class ContainerRegistryManagementClient extends ContainerRegistryManagementClientContext {
+export class ContainerRegistryManagementClient extends coreClient.ServiceClient {
+    // (undocumented)
+    $host: string;
     constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: ContainerRegistryManagementClientOptionalParams);
     // (undocumented)
     agentPools: AgentPools;
     // (undocumented)
-    connectedRegistries: ConnectedRegistries;
-    // (undocumented)
-    exportPipelines: ExportPipelines;
-    // (undocumented)
-    importPipelines: ImportPipelines;
-    // (undocumented)
     operations: Operations;
     // (undocumented)
-    pipelineRuns: PipelineRuns;
-    // (undocumented)
     privateEndpointConnections: PrivateEndpointConnections;
     // (undocumented)
     registries: Registries;
@@ -338,26 +209,15 @@ export class ContainerRegistryManagementClient extends ContainerRegistryManageme
     // (undocumented)
     runs: Runs;
     // (undocumented)
-    scopeMaps: ScopeMaps;
+    subscriptionId: string;
     // (undocumented)
     taskRuns: TaskRuns;
     // (undocumented)
     tasks: Tasks;
     // (undocumented)
-    tokens: Tokens;
-    // (undocumented)
     webhooks: Webhooks;
 }
 
-// @public (undocumented)
-export class ContainerRegistryManagementClientContext extends coreClient.ServiceClient {
-    // (undocumented)
-    $host: string;
-    constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: ContainerRegistryManagementClientOptionalParams);
-    // (undocumented)
-    subscriptionId: string;
-}
-
 // @public
 export interface ContainerRegistryManagementClientOptionalParams extends coreClient.ServiceClientOptions {
     $host?: string;
@@ -469,7 +329,7 @@ export interface ErrorResponse {
 // @public
 export interface ErrorResponseBody {
     code: string;
-    details?: InnerErrorDescription;
+    details?: InnerErrorDescription[];
     message: string;
     target?: string;
 }
@@ -525,74 +385,6 @@ export interface EventResponseMessage {
     version?: string;
 }
 
-// @public
-export type ExportPipeline = ProxyResource & {
-    location?: string;
-    identity?: IdentityProperties;
-    target?: ExportPipelineTargetProperties;
-    options?: PipelineOptions[];
-    readonly provisioningState?: ProvisioningState;
-};
-
-// @public
-export interface ExportPipelineListResult {
-    nextLink?: string;
-    value?: ExportPipeline[];
-}
-
-// @public
-export interface ExportPipelines {
-    beginCreate(resourceGroupName: string, registryName: string, exportPipelineName: string, exportPipelineCreateParameters: ExportPipeline, options?: ExportPipelinesCreateOptionalParams): Promise<PollerLike<PollOperationState<ExportPipelinesCreateResponse>, ExportPipelinesCreateResponse>>;
-    beginCreateAndWait(resourceGroupName: string, registryName: string, exportPipelineName: string, exportPipelineCreateParameters: ExportPipeline, options?: ExportPipelinesCreateOptionalParams): Promise<ExportPipelinesCreateResponse>;
-    beginDelete(resourceGroupName: string, registryName: string, exportPipelineName: string, options?: ExportPipelinesDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeleteAndWait(resourceGroupName: string, registryName: string, exportPipelineName: string, options?: ExportPipelinesDeleteOptionalParams): Promise<void>;
-    get(resourceGroupName: string, registryName: string, exportPipelineName: string, options?: ExportPipelinesGetOptionalParams): Promise<ExportPipelinesGetResponse>;
-    list(resourceGroupName: string, registryName: string, options?: ExportPipelinesListOptionalParams): PagedAsyncIterableIterator<ExportPipeline>;
-}
-
-// @public
-export interface ExportPipelinesCreateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type ExportPipelinesCreateResponse = ExportPipeline;
-
-// @public
-export interface ExportPipelinesDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface ExportPipelinesGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ExportPipelinesGetResponse = ExportPipeline;
-
-// @public
-export interface ExportPipelinesListNextOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ExportPipelinesListNextResponse = ExportPipelineListResult;
-
-// @public
-export interface ExportPipelinesListOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ExportPipelinesListResponse = ExportPipelineListResult;
-
-// @public
-export interface ExportPipelineTargetProperties {
-    keyVaultUri: string;
-    type?: string;
-    uri?: string;
-}
-
 // @public
 export interface ExportPolicy {
     status?: ExportPolicyStatus;
@@ -630,19 +422,6 @@ export type FileTaskStepUpdateParameters = TaskStepUpdateParameters & {
     values?: SetValue[];
 };
 
-// @public
-export interface GenerateCredentialsParameters {
-    expiry?: Date;
-    name?: TokenPasswordName;
-    tokenId?: string;
-}
-
-// @public
-export interface GenerateCredentialsResult {
-    passwords?: TokenPassword[];
-    username?: string;
-}
-
 // @public
 export interface IdentityProperties {
     principalId?: string;
@@ -679,75 +458,6 @@ export interface ImportImageParameters {
 // @public
 export type ImportMode = string;
 
-// @public
-export type ImportPipeline = ProxyResource & {
-    location?: string;
-    identity?: IdentityProperties;
-    source?: ImportPipelineSourceProperties;
-    trigger?: PipelineTriggerProperties;
-    options?: PipelineOptions[];
-    readonly provisioningState?: ProvisioningState;
-};
-
-// @public
-export interface ImportPipelineListResult {
-    nextLink?: string;
-    value?: ImportPipeline[];
-}
-
-// @public
-export interface ImportPipelines {
-    beginCreate(resourceGroupName: string, registryName: string, importPipelineName: string, importPipelineCreateParameters: ImportPipeline, options?: ImportPipelinesCreateOptionalParams): Promise<PollerLike<PollOperationState<ImportPipelinesCreateResponse>, ImportPipelinesCreateResponse>>;
-    beginCreateAndWait(resourceGroupName: string, registryName: string, importPipelineName: string, importPipelineCreateParameters: ImportPipeline, options?: ImportPipelinesCreateOptionalParams): Promise<ImportPipelinesCreateResponse>;
-    beginDelete(resourceGroupName: string, registryName: string, importPipelineName: string, options?: ImportPipelinesDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeleteAndWait(resourceGroupName: string, registryName: string, importPipelineName: string, options?: ImportPipelinesDeleteOptionalParams): Promise<void>;
-    get(resourceGroupName: string, registryName: string, importPipelineName: string, options?: ImportPipelinesGetOptionalParams): Promise<ImportPipelinesGetResponse>;
-    list(resourceGroupName: string, registryName: string, options?: ImportPipelinesListOptionalParams): PagedAsyncIterableIterator<ImportPipeline>;
-}
-
-// @public
-export interface ImportPipelinesCreateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type ImportPipelinesCreateResponse = ImportPipeline;
-
-// @public
-export interface ImportPipelinesDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface ImportPipelinesGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ImportPipelinesGetResponse = ImportPipeline;
-
-// @public
-export interface ImportPipelinesListNextOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ImportPipelinesListNextResponse = ImportPipelineListResult;
-
-// @public
-export interface ImportPipelinesListOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ImportPipelinesListResponse = ImportPipelineListResult;
-
-// @public
-export interface ImportPipelineSourceProperties {
-    keyVaultUri: string;
-    type?: PipelineSourceType;
-    uri?: string;
-}
-
 // @public (undocumented)
 export interface ImportSource {
     credentials?: ImportSourceCredentials;
@@ -798,14 +508,6 @@ export enum KnownActionsRequired {
     Recreate = "Recreate"
 }
 
-// @public
-export enum KnownActivationStatus {
-    // (undocumented)
-    Active = "Active",
-    // (undocumented)
-    Inactive = "Inactive"
-}
-
 // @public
 export enum KnownArchitecture {
     // (undocumented)
@@ -820,14 +522,6 @@ export enum KnownArchitecture {
     X86 = "x86"
 }
 
-// @public
-export enum KnownAuditLogStatus {
-    // (undocumented)
-    Disabled = "Disabled",
-    // (undocumented)
-    Enabled = "Enabled"
-}
-
 // @public
 export enum KnownBaseImageDependencyType {
     // (undocumented)
@@ -844,36 +538,6 @@ export enum KnownBaseImageTriggerType {
     Runtime = "Runtime"
 }
 
-// @public
-export enum KnownCertificateType {
-    // (undocumented)
-    LocalDirectory = "LocalDirectory"
-}
-
-// @public
-export enum KnownConnectedRegistryMode {
-    // (undocumented)
-    Mirror = "Mirror",
-    // (undocumented)
-    ReadOnly = "ReadOnly",
-    // (undocumented)
-    ReadWrite = "ReadWrite",
-    // (undocumented)
-    Registry = "Registry"
-}
-
-// @public
-export enum KnownConnectionState {
-    // (undocumented)
-    Offline = "Offline",
-    // (undocumented)
-    Online = "Online",
-    // (undocumented)
-    Syncing = "Syncing",
-    // (undocumented)
-    Unhealthy = "Unhealthy"
-}
-
 // @public
 export enum KnownConnectionStatus {
     // (undocumented)
@@ -942,20 +606,6 @@ export enum KnownLastModifiedByType {
     User = "User"
 }
 
-// @public
-export enum KnownLogLevel {
-    // (undocumented)
-    Debug = "Debug",
-    // (undocumented)
-    Error = "Error",
-    // (undocumented)
-    Information = "Information",
-    // (undocumented)
-    None = "None",
-    // (undocumented)
-    Warning = "Warning"
-}
-
 // @public
 export enum KnownNetworkRuleBypassOptions {
     // (undocumented)
@@ -972,36 +622,6 @@ export enum KnownOS {
     Windows = "Windows"
 }
 
-// @public
-export enum KnownPipelineOptions {
-    // (undocumented)
-    ContinueOnErrors = "ContinueOnErrors",
-    // (undocumented)
-    DeleteSourceBlobOnSuccess = "DeleteSourceBlobOnSuccess",
-    // (undocumented)
-    OverwriteBlobs = "OverwriteBlobs",
-    // (undocumented)
-    OverwriteTags = "OverwriteTags"
-}
-
-// @public
-export enum KnownPipelineRunSourceType {
-    // (undocumented)
-    AzureStorageBlob = "AzureStorageBlob"
-}
-
-// @public
-export enum KnownPipelineRunTargetType {
-    // (undocumented)
-    AzureStorageBlob = "AzureStorageBlob"
-}
-
-// @public
-export enum KnownPipelineSourceType {
-    // (undocumented)
-    AzureStorageBlobContainer = "AzureStorageBlobContainer"
-}
-
 // @public
 export enum KnownPolicyStatus {
     // (undocumented)
@@ -1148,38 +768,6 @@ export enum KnownTaskStatus {
     Enabled = "Enabled"
 }
 
-// @public
-export enum KnownTlsStatus {
-    // (undocumented)
-    Disabled = "Disabled",
-    // (undocumented)
-    Enabled = "Enabled"
-}
-
-// @public
-export enum KnownTokenCertificateName {
-    // (undocumented)
-    Certificate1 = "certificate1",
-    // (undocumented)
-    Certificate2 = "certificate2"
-}
-
-// @public
-export enum KnownTokenPasswordName {
-    // (undocumented)
-    Password1 = "password1",
-    // (undocumented)
-    Password2 = "password2"
-}
-
-// @public
-export enum KnownTokenStatus {
-    // (undocumented)
-    Disabled = "disabled",
-    // (undocumented)
-    Enabled = "enabled"
-}
-
 // @public
 export enum KnownTokenType {
     // (undocumented)
@@ -1253,21 +841,6 @@ export enum KnownZoneRedundancy {
 // @public
 export type LastModifiedByType = string;
 
-// @public
-export interface LoggingProperties {
-    auditLogStatus?: AuditLogStatus;
-    logLevel?: LogLevel;
-}
-
-// @public
-export interface LoginServerProperties {
-    readonly host?: string;
-    readonly tls?: TlsProperties;
-}
-
-// @public
-export type LogLevel = string;
-
 // @public
 export type NetworkRuleBypassOptions = string;
 
@@ -1275,7 +848,6 @@ export type NetworkRuleBypassOptions = string;
 export interface NetworkRuleSet {
     defaultAction: DefaultAction;
     ipRules?: IPRule[];
-    virtualNetworkRules?: VirtualNetworkRule[];
 }
 
 // @public
@@ -1357,140 +929,13 @@ export interface OverrideTaskStepProperties {
 }
 
 // @public
-export interface ParentProperties {
-    id?: string;
-    syncProperties: SyncProperties;
-}
-
-// @public
-export type PasswordName = "password" | "password2";
-
-// @public
-export type PipelineOptions = string;
-
-// @public
-export type PipelineRun = ProxyResource & {
-    readonly provisioningState?: ProvisioningState;
-    request?: PipelineRunRequest;
-    readonly response?: PipelineRunResponse;
-    forceUpdateTag?: string;
-};
-
-// @public
-export interface PipelineRunListResult {
-    nextLink?: string;
-    value?: PipelineRun[];
-}
-
-// @public
-export interface PipelineRunRequest {
-    artifacts?: string[];
-    catalogDigest?: string;
-    pipelineResourceId?: string;
-    source?: PipelineRunSourceProperties;
-    target?: PipelineRunTargetProperties;
-}
-
-// @public
-export interface PipelineRunResponse {
-    catalogDigest?: string;
-    finishTime?: Date;
-    importedArtifacts?: string[];
-    pipelineRunErrorMessage?: string;
-    progress?: ProgressProperties;
-    source?: ImportPipelineSourceProperties;
-    startTime?: Date;
-    status?: string;
-    target?: ExportPipelineTargetProperties;
-    trigger?: PipelineTriggerDescriptor;
-}
-
-// @public
-export interface PipelineRuns {
-    beginCreate(resourceGroupName: string, registryName: string, pipelineRunName: string, pipelineRunCreateParameters: PipelineRun, options?: PipelineRunsCreateOptionalParams): Promise<PollerLike<PollOperationState<PipelineRunsCreateResponse>, PipelineRunsCreateResponse>>;
-    beginCreateAndWait(resourceGroupName: string, registryName: string, pipelineRunName: string, pipelineRunCreateParameters: PipelineRun, options?: PipelineRunsCreateOptionalParams): Promise<PipelineRunsCreateResponse>;
-    beginDelete(resourceGroupName: string, registryName: string, pipelineRunName: string, options?: PipelineRunsDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeleteAndWait(resourceGroupName: string, registryName: string, pipelineRunName: string, options?: PipelineRunsDeleteOptionalParams): Promise<void>;
-    get(resourceGroupName: string, registryName: string, pipelineRunName: string, options?: PipelineRunsGetOptionalParams): Promise<PipelineRunsGetResponse>;
-    list(resourceGroupName: string, registryName: string, options?: PipelineRunsListOptionalParams): PagedAsyncIterableIterator<PipelineRun>;
-}
-
-// @public
-export interface PipelineRunsCreateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type PipelineRunsCreateResponse = PipelineRun;
-
-// @public
-export interface PipelineRunsDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface PipelineRunsGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type PipelineRunsGetResponse = PipelineRun;
-
-// @public
-export interface PipelineRunsListNextOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type PipelineRunsListNextResponse = PipelineRunListResult;
-
-// @public
-export interface PipelineRunsListOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type PipelineRunsListResponse = PipelineRunListResult;
-
-// @public (undocumented)
-export interface PipelineRunSourceProperties {
-    name?: string;
-    type?: PipelineRunSourceType;
-}
-
-// @public
-export type PipelineRunSourceType = string;
-
-// @public (undocumented)
-export interface PipelineRunTargetProperties {
+export interface PackageType {
+    readonly endpoint?: string;
     name?: string;
-    type?: PipelineRunTargetType;
-}
-
-// @public
-export type PipelineRunTargetType = string;
-
-// @public (undocumented)
-export interface PipelineSourceTriggerDescriptor {
-    timestamp?: Date;
-}
-
-// @public (undocumented)
-export interface PipelineSourceTriggerProperties {
-    status: TriggerStatus;
 }
 
 // @public
-export type PipelineSourceType = string;
-
-// @public (undocumented)
-export interface PipelineTriggerDescriptor {
-    sourceTrigger?: PipelineSourceTriggerDescriptor;
-}
-
-// @public (undocumented)
-export interface PipelineTriggerProperties {
-    sourceTrigger?: PipelineSourceTriggerProperties;
-}
+export type PasswordName = "password" | "password2";
 
 // @public
 export interface PlatformProperties {
@@ -1604,11 +1049,6 @@ export interface PrivateLinkServiceConnectionState {
     status?: ConnectionStatus;
 }
 
-// @public (undocumented)
-export interface ProgressProperties {
-    percentage?: string;
-}
-
 // @public
 export type ProvisioningState = string;
 
@@ -1639,8 +1079,6 @@ export interface Registries {
     beginCreateAndWait(resourceGroupName: string, registryName: string, registry: Registry, options?: RegistriesCreateOptionalParams): Promise<RegistriesCreateResponse>;
     beginDelete(resourceGroupName: string, registryName: string, options?: RegistriesDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
     beginDeleteAndWait(resourceGroupName: string, registryName: string, options?: RegistriesDeleteOptionalParams): Promise<void>;
-    beginGenerateCredentials(resourceGroupName: string, registryName: string, generateCredentialsParameters: GenerateCredentialsParameters, options?: RegistriesGenerateCredentialsOptionalParams): Promise<PollerLike<PollOperationState<RegistriesGenerateCredentialsResponse>, RegistriesGenerateCredentialsResponse>>;
-    beginGenerateCredentialsAndWait(resourceGroupName: string, registryName: string, generateCredentialsParameters: GenerateCredentialsParameters, options?: RegistriesGenerateCredentialsOptionalParams): Promise<RegistriesGenerateCredentialsResponse>;
     beginImportImage(resourceGroupName: string, registryName: string, parameters: ImportImageParameters, options?: RegistriesImportImageOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
     beginImportImageAndWait(resourceGroupName: string, registryName: string, parameters: ImportImageParameters, options?: RegistriesImportImageOptionalParams): Promise<void>;
     beginScheduleRun(resourceGroupName: string, registryName: string, runRequest: RunRequestUnion, options?: RegistriesScheduleRunOptionalParams): Promise<PollerLike<PollOperationState<RegistriesScheduleRunResponse>, RegistriesScheduleRunResponse>>;
@@ -1650,6 +1088,7 @@ export interface Registries {
     checkNameAvailability(registryNameCheckRequest: RegistryNameCheckRequest, options?: RegistriesCheckNameAvailabilityOptionalParams): Promise<RegistriesCheckNameAvailabilityResponse>;
     get(resourceGroupName: string, registryName: string, options?: RegistriesGetOptionalParams): Promise<RegistriesGetResponse>;
     getBuildSourceUploadUrl(resourceGroupName: string, registryName: string, options?: RegistriesGetBuildSourceUploadUrlOptionalParams): Promise<RegistriesGetBuildSourceUploadUrlResponse>;
+    getPrivateLinkResource(resourceGroupName: string, registryName: string, groupName: string, options?: RegistriesGetPrivateLinkResourceOptionalParams): Promise<RegistriesGetPrivateLinkResourceResponse>;
     list(options?: RegistriesListOptionalParams): PagedAsyncIterableIterator<Registry>;
     listByResourceGroup(resourceGroupName: string, options?: RegistriesListByResourceGroupOptionalParams): PagedAsyncIterableIterator<Registry>;
     listCredentials(resourceGroupName: string, registryName: string, options?: RegistriesListCredentialsOptionalParams): Promise<RegistriesListCredentialsResponse>;
@@ -1681,24 +1120,22 @@ export interface RegistriesDeleteOptionalParams extends coreClient.OperationOpti
 }
 
 // @public
-export interface RegistriesGenerateCredentialsOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
+export interface RegistriesGetBuildSourceUploadUrlOptionalParams extends coreClient.OperationOptions {
 }
 
 // @public
-export type RegistriesGenerateCredentialsResponse = GenerateCredentialsResult;
+export type RegistriesGetBuildSourceUploadUrlResponse = SourceUploadDefinition;
 
 // @public
-export interface RegistriesGetBuildSourceUploadUrlOptionalParams extends coreClient.OperationOptions {
+export interface RegistriesGetOptionalParams extends coreClient.OperationOptions {
 }
 
 // @public
-export type RegistriesGetBuildSourceUploadUrlResponse = SourceUploadDefinition;
+export interface RegistriesGetPrivateLinkResourceOptionalParams extends coreClient.OperationOptions {
+}
 
 // @public
-export interface RegistriesGetOptionalParams extends coreClient.OperationOptions {
-}
+export type RegistriesGetPrivateLinkResourceResponse = PrivateLinkResource;
 
 // @public
 export type RegistriesGetResponse = Registry;
@@ -1808,7 +1245,6 @@ export type Registry = Resource & {
     publicNetworkAccess?: PublicNetworkAccess;
     networkRuleBypassOptions?: NetworkRuleBypassOptions;
     zoneRedundancy?: ZoneRedundancy;
-    anonymousPullEnabled?: boolean;
 };
 
 // @public
@@ -1845,7 +1281,6 @@ export interface RegistryPassword {
 // @public
 export interface RegistryUpdateParameters {
     adminUserEnabled?: boolean;
-    anonymousPullEnabled?: boolean;
     dataEndpointEnabled?: boolean;
     encryption?: EncryptionProperty;
     identity?: IdentityProperties;
@@ -2117,84 +1552,6 @@ export interface RunUpdateParameters {
     isArchiveEnabled?: boolean;
 }
 
-// @public
-export type ScopeMap = ProxyResource & {
-    description?: string;
-    readonly typePropertiesType?: string;
-    readonly creationDate?: Date;
-    readonly provisioningState?: ProvisioningState;
-    actions?: string[];
-};
-
-// @public
-export interface ScopeMapListResult {
-    nextLink?: string;
-    value?: ScopeMap[];
-}
-
-// @public
-export interface ScopeMaps {
-    beginCreate(resourceGroupName: string, registryName: string, scopeMapName: string, scopeMapCreateParameters: ScopeMap, options?: ScopeMapsCreateOptionalParams): Promise<PollerLike<PollOperationState<ScopeMapsCreateResponse>, ScopeMapsCreateResponse>>;
-    beginCreateAndWait(resourceGroupName: string, registryName: string, scopeMapName: string, scopeMapCreateParameters: ScopeMap, options?: ScopeMapsCreateOptionalParams): Promise<ScopeMapsCreateResponse>;
-    beginDelete(resourceGroupName: string, registryName: string, scopeMapName: string, options?: ScopeMapsDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeleteAndWait(resourceGroupName: string, registryName: string, scopeMapName: string, options?: ScopeMapsDeleteOptionalParams): Promise<void>;
-    beginUpdate(resourceGroupName: string, registryName: string, scopeMapName: string, scopeMapUpdateParameters: ScopeMapUpdateParameters, options?: ScopeMapsUpdateOptionalParams): Promise<PollerLike<PollOperationState<ScopeMapsUpdateResponse>, ScopeMapsUpdateResponse>>;
-    beginUpdateAndWait(resourceGroupName: string, registryName: string, scopeMapName: string, scopeMapUpdateParameters: ScopeMapUpdateParameters, options?: ScopeMapsUpdateOptionalParams): Promise<ScopeMapsUpdateResponse>;
-    get(resourceGroupName: string, registryName: string, scopeMapName: string, options?: ScopeMapsGetOptionalParams): Promise<ScopeMapsGetResponse>;
-    list(resourceGroupName: string, registryName: string, options?: ScopeMapsListOptionalParams): PagedAsyncIterableIterator<ScopeMap>;
-}
-
-// @public
-export interface ScopeMapsCreateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type ScopeMapsCreateResponse = ScopeMap;
-
-// @public
-export interface ScopeMapsDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface ScopeMapsGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ScopeMapsGetResponse = ScopeMap;
-
-// @public
-export interface ScopeMapsListNextOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ScopeMapsListNextResponse = ScopeMapListResult;
-
-// @public
-export interface ScopeMapsListOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type ScopeMapsListResponse = ScopeMapListResult;
-
-// @public
-export interface ScopeMapsUpdateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type ScopeMapsUpdateResponse = ScopeMap;
-
-// @public
-export interface ScopeMapUpdateParameters {
-    actions?: string[];
-    description?: string;
-}
-
 // @public
 export interface SecretObject {
     type?: SecretObjectType;
@@ -2299,33 +1656,12 @@ export interface Status {
     readonly timestamp?: Date;
 }
 
-// @public
-export interface StatusDetailProperties {
-    readonly code?: string;
-    readonly correlationId?: string;
-    readonly description?: string;
-    readonly timestamp?: Date;
-    readonly type?: string;
-}
-
 // @public
 export type StepType = string;
 
 // @public
-export interface SyncProperties {
-    readonly gatewayEndpoint?: string;
-    readonly lastSyncTime?: Date;
-    messageTtl: string;
-    schedule?: string;
-    syncWindow?: string;
-    tokenId: string;
-}
-
-// @public
-export interface SyncUpdateProperties {
-    messageTtl?: string;
-    schedule?: string;
-    syncWindow?: string;
+export interface StorageAccountProperties {
+    id: string;
 }
 
 // @public
@@ -2599,137 +1935,9 @@ export interface TimerTriggerUpdateParameters {
     status?: TriggerStatus;
 }
 
-// @public
-export interface TlsCertificateProperties {
-    readonly location?: string;
-    readonly type?: CertificateType;
-}
-
-// @public
-export interface TlsProperties {
-    readonly certificate?: TlsCertificateProperties;
-    readonly status?: TlsStatus;
-}
-
-// @public
-export type TlsStatus = string;
-
-// @public
-export type Token = ProxyResource & {
-    readonly creationDate?: Date;
-    readonly provisioningState?: ProvisioningState;
-    scopeMapId?: string;
-    credentials?: TokenCredentialsProperties;
-    status?: TokenStatus;
-};
-
-// @public
-export interface TokenCertificate {
-    encodedPemCertificate?: string;
-    expiry?: Date;
-    // (undocumented)
-    name?: TokenCertificateName;
-    thumbprint?: string;
-}
-
-// @public
-export type TokenCertificateName = string;
-
-// @public
-export interface TokenCredentialsProperties {
-    // (undocumented)
-    certificates?: TokenCertificate[];
-    // (undocumented)
-    passwords?: TokenPassword[];
-}
-
-// @public
-export interface TokenListResult {
-    nextLink?: string;
-    value?: Token[];
-}
-
-// @public
-export interface TokenPassword {
-    creationTime?: Date;
-    expiry?: Date;
-    name?: TokenPasswordName;
-    readonly value?: string;
-}
-
-// @public
-export type TokenPasswordName = string;
-
-// @public
-export interface Tokens {
-    beginCreate(resourceGroupName: string, registryName: string, tokenName: string, tokenCreateParameters: Token, options?: TokensCreateOptionalParams): Promise<PollerLike<PollOperationState<TokensCreateResponse>, TokensCreateResponse>>;
-    beginCreateAndWait(resourceGroupName: string, registryName: string, tokenName: string, tokenCreateParameters: Token, options?: TokensCreateOptionalParams): Promise<TokensCreateResponse>;
-    beginDelete(resourceGroupName: string, registryName: string, tokenName: string, options?: TokensDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
-    beginDeleteAndWait(resourceGroupName: string, registryName: string, tokenName: string, options?: TokensDeleteOptionalParams): Promise<void>;
-    beginUpdate(resourceGroupName: string, registryName: string, tokenName: string, tokenUpdateParameters: TokenUpdateParameters, options?: TokensUpdateOptionalParams): Promise<PollerLike<PollOperationState<TokensUpdateResponse>, TokensUpdateResponse>>;
-    beginUpdateAndWait(resourceGroupName: string, registryName: string, tokenName: string, tokenUpdateParameters: TokenUpdateParameters, options?: TokensUpdateOptionalParams): Promise<TokensUpdateResponse>;
-    get(resourceGroupName: string, registryName: string, tokenName: string, options?: TokensGetOptionalParams): Promise<TokensGetResponse>;
-    list(resourceGroupName: string, registryName: string, options?: TokensListOptionalParams): PagedAsyncIterableIterator<Token>;
-}
-
-// @public
-export interface TokensCreateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type TokensCreateResponse = Token;
-
-// @public
-export interface TokensDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export interface TokensGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type TokensGetResponse = Token;
-
-// @public
-export interface TokensListNextOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type TokensListNextResponse = TokenListResult;
-
-// @public
-export interface TokensListOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type TokensListResponse = TokenListResult;
-
-// @public
-export type TokenStatus = string;
-
-// @public
-export interface TokensUpdateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type TokensUpdateResponse = Token;
-
 // @public
 export type TokenType = string;
 
-// @public
-export interface TokenUpdateParameters {
-    credentials?: TokenCredentialsProperties;
-    scopeMapId?: string;
-    status?: TokenStatus;
-}
-
 // @public
 export interface TriggerProperties {
     baseImageTrigger?: BaseImageTrigger;
@@ -2768,12 +1976,6 @@ export interface UserIdentityProperties {
 // @public
 export type Variant = string;
 
-// @public
-export interface VirtualNetworkRule {
-    action?: Action;
-    virtualNetworkResourceId: string;
-}
-
 // @public
 export type Webhook = Resource & {
     status?: WebhookStatus;
diff --git a/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts b/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts
index dfe32b725540..691b36f3fd16 100644
--- a/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts
@@ -6,18 +6,13 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
+import * as coreClient from "@azure/core-client";
 import * as coreAuth from "@azure/core-auth";
 import {
-  ConnectedRegistriesImpl,
-  ExportPipelinesImpl,
   RegistriesImpl,
-  ImportPipelinesImpl,
   OperationsImpl,
-  PipelineRunsImpl,
   PrivateEndpointConnectionsImpl,
   ReplicationsImpl,
-  ScopeMapsImpl,
-  TokensImpl,
   WebhooksImpl,
   AgentPoolsImpl,
   RunsImpl,
@@ -25,26 +20,22 @@ import {
   TasksImpl
 } from "./operations";
 import {
-  ConnectedRegistries,
-  ExportPipelines,
   Registries,
-  ImportPipelines,
   Operations,
-  PipelineRuns,
   PrivateEndpointConnections,
   Replications,
-  ScopeMaps,
-  Tokens,
   Webhooks,
   AgentPools,
   Runs,
   TaskRuns,
   Tasks
 } from "./operationsInterfaces";
-import { ContainerRegistryManagementClientContext } from "./containerRegistryManagementClientContext";
 import { ContainerRegistryManagementClientOptionalParams } from "./models";
 
-export class ContainerRegistryManagementClient extends ContainerRegistryManagementClientContext {
+export class ContainerRegistryManagementClient extends coreClient.ServiceClient {
+  $host: string;
+  subscriptionId: string;
+
   /**
    * Initializes a new instance of the ContainerRegistryManagementClient class.
    * @param credentials Subscription credentials which uniquely identify client subscription.
@@ -56,17 +47,49 @@ export class ContainerRegistryManagementClient extends ContainerRegistryManageme
     subscriptionId: string,
     options?: ContainerRegistryManagementClientOptionalParams
   ) {
-    super(credentials, subscriptionId, options);
-    this.connectedRegistries = new ConnectedRegistriesImpl(this);
-    this.exportPipelines = new ExportPipelinesImpl(this);
+    if (credentials === undefined) {
+      throw new Error("'credentials' cannot be null");
+    }
+    if (subscriptionId === undefined) {
+      throw new Error("'subscriptionId' cannot be null");
+    }
+
+    // Initializing default values for options
+    if (!options) {
+      options = {};
+    }
+    const defaults: ContainerRegistryManagementClientOptionalParams = {
+      requestContentType: "application/json; charset=utf-8",
+      credential: credentials
+    };
+
+    const packageDetails = `azsdk-js-arm-containerregistry/10.0.0-beta.2`;
+    const userAgentPrefix =
+      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+        : `${packageDetails}`;
+
+    if (!options.credentialScopes) {
+      options.credentialScopes = ["https://management.azure.com/.default"];
+    }
+    const optionsWithDefaults = {
+      ...defaults,
+      ...options,
+      userAgentOptions: {
+        userAgentPrefix
+      },
+      baseUri: options.endpoint || "https://management.azure.com"
+    };
+    super(optionsWithDefaults);
+    // Parameter assignments
+    this.subscriptionId = subscriptionId;
+
+    // Assigning values to Constant parameters
+    this.$host = options.$host || "https://management.azure.com";
     this.registries = new RegistriesImpl(this);
-    this.importPipelines = new ImportPipelinesImpl(this);
     this.operations = new OperationsImpl(this);
-    this.pipelineRuns = new PipelineRunsImpl(this);
     this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
     this.replications = new ReplicationsImpl(this);
-    this.scopeMaps = new ScopeMapsImpl(this);
-    this.tokens = new TokensImpl(this);
     this.webhooks = new WebhooksImpl(this);
     this.agentPools = new AgentPoolsImpl(this);
     this.runs = new RunsImpl(this);
@@ -74,16 +97,10 @@ export class ContainerRegistryManagementClient extends ContainerRegistryManageme
     this.tasks = new TasksImpl(this);
   }
 
-  connectedRegistries: ConnectedRegistries;
-  exportPipelines: ExportPipelines;
   registries: Registries;
-  importPipelines: ImportPipelines;
   operations: Operations;
-  pipelineRuns: PipelineRuns;
   privateEndpointConnections: PrivateEndpointConnections;
   replications: Replications;
-  scopeMaps: ScopeMaps;
-  tokens: Tokens;
   webhooks: Webhooks;
   agentPools: AgentPools;
   runs: Runs;
diff --git a/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClientContext.ts b/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClientContext.ts
deleted file mode 100644
index 062927207bc3..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClientContext.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import * as coreClient from "@azure/core-client";
-import * as coreAuth from "@azure/core-auth";
-import { ContainerRegistryManagementClientOptionalParams } from "./models";
-
-export class ContainerRegistryManagementClientContext extends coreClient.ServiceClient {
-  $host: string;
-  subscriptionId: string;
-
-  /**
-   * Initializes a new instance of the ContainerRegistryManagementClientContext class.
-   * @param credentials Subscription credentials which uniquely identify client subscription.
-   * @param subscriptionId The Microsoft Azure subscription ID.
-   * @param options The parameter options
-   */
-  constructor(
-    credentials: coreAuth.TokenCredential,
-    subscriptionId: string,
-    options?: ContainerRegistryManagementClientOptionalParams
-  ) {
-    if (credentials === undefined) {
-      throw new Error("'credentials' cannot be null");
-    }
-    if (subscriptionId === undefined) {
-      throw new Error("'subscriptionId' cannot be null");
-    }
-
-    // Initializing default values for options
-    if (!options) {
-      options = {};
-    }
-    const defaults: ContainerRegistryManagementClientOptionalParams = {
-      requestContentType: "application/json; charset=utf-8",
-      credential: credentials
-    };
-
-    const packageDetails = `azsdk-js-arm-containerregistry/10.0.0-beta.1`;
-    const userAgentPrefix =
-      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
-        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
-        : `${packageDetails}`;
-
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
-    const optionsWithDefaults = {
-      ...defaults,
-      ...options,
-      userAgentOptions: {
-        userAgentPrefix
-      },
-      baseUri: options.endpoint || "https://management.azure.com"
-    };
-    super(optionsWithDefaults);
-    // Parameter assignments
-    this.subscriptionId = subscriptionId;
-
-    // Assigning values to Constant parameters
-    this.$host = options.$host || "https://management.azure.com";
-  }
-}
diff --git a/sdk/containerregistry/arm-containerregistry/src/index.ts b/sdk/containerregistry/arm-containerregistry/src/index.ts
index e5fd73f27732..c9b77c7fcbd2 100644
--- a/sdk/containerregistry/arm-containerregistry/src/index.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/index.ts
@@ -9,5 +9,4 @@
 /// <reference lib="esnext.asynciterable" />
 export * from "./models";
 export { ContainerRegistryManagementClient } from "./containerRegistryManagementClient";
-export { ContainerRegistryManagementClientContext } from "./containerRegistryManagementClientContext";
 export * from "./operationsInterfaces";
diff --git a/sdk/containerregistry/arm-containerregistry/src/models/index.ts b/sdk/containerregistry/arm-containerregistry/src/models/index.ts
index b468d0034084..73ccfed9b022 100644
--- a/sdk/containerregistry/arm-containerregistry/src/models/index.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/models/index.ts
@@ -25,268 +25,6 @@ export type TaskStepUpdateParametersUnion =
   | FileTaskStepUpdateParameters
   | EncodedTaskStepUpdateParameters;
 
-/** The result of a request to list connected registries for a container registry. */
-export interface ConnectedRegistryListResult {
-  /** The list of connected registries. Since this list may be incomplete, the nextLink field should be used to request the next list of connected registries. */
-  value?: ConnectedRegistry[];
-  /** The URI that can be used to request the next list of connected registries. */
-  nextLink?: string;
-}
-
-/** The resource model definition for a ARM proxy resource. It will have everything other than required location and tags. */
-export interface ProxyResource {
-  /**
-   * The resource ID.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly id?: string;
-  /**
-   * The name of the resource.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly name?: string;
-  /**
-   * The type of the resource.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly type?: string;
-  /**
-   * Metadata pertaining to creation and last modification of the resource.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly systemData?: SystemData;
-}
-
-/** Metadata pertaining to creation and last modification of the resource. */
-export interface SystemData {
-  /** The identity that created the resource. */
-  createdBy?: string;
-  /** The type of identity that created the resource. */
-  createdByType?: CreatedByType;
-  /** The timestamp of resource creation (UTC). */
-  createdAt?: Date;
-  /** The identity that last modified the resource. */
-  lastModifiedBy?: string;
-  /** The type of identity that last modified the resource. */
-  lastModifiedByType?: LastModifiedByType;
-  /** The timestamp of resource modification (UTC). */
-  lastModifiedAt?: Date;
-}
-
-/** The activation properties of the connected registry. */
-export interface ActivationProperties {
-  /**
-   * The activation status of the connected registry.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly status?: ActivationStatus;
-}
-
-/** The properties of the connected registry parent. */
-export interface ParentProperties {
-  /** The resource ID of the parent to which the connected registry will be associated. */
-  id?: string;
-  /** The sync properties of the connected registry with its parent. */
-  syncProperties: SyncProperties;
-}
-
-/** The sync properties of the connected registry with its parent. */
-export interface SyncProperties {
-  /** The resource ID of the ACR token used to authenticate the connected registry to its parent during sync. */
-  tokenId: string;
-  /** The cron expression indicating the schedule that the connected registry will sync with its parent. */
-  schedule?: string;
-  /** The time window during which sync is enabled for each schedule occurrence. Specify the duration using the format P[n]Y[n]M[n]DT[n]H[n]M[n]S as per ISO8601. */
-  syncWindow?: string;
-  /** The period of time for which a message is available to sync before it is expired. Specify the duration using the format P[n]Y[n]M[n]DT[n]H[n]M[n]S as per ISO8601. */
-  messageTtl: string;
-  /**
-   * The last time a sync occurred between the connected registry and its parent.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly lastSyncTime?: Date;
-  /**
-   * The gateway endpoint used by the connected registry to communicate with its parent.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly gatewayEndpoint?: string;
-}
-
-/** The login server properties of the connected registry. */
-export interface LoginServerProperties {
-  /**
-   * The host of the connected registry. Can be FQDN or IP.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly host?: string;
-  /**
-   * The TLS properties of the connected registry login server.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly tls?: TlsProperties;
-}
-
-/** The TLS properties of the connected registry login server. */
-export interface TlsProperties {
-  /**
-   * Indicates whether HTTPS is enabled for the login server.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly status?: TlsStatus;
-  /**
-   * The certificate used to configure HTTPS for the login server.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly certificate?: TlsCertificateProperties;
-}
-
-/** The TLS certificate properties of the connected registry login server. */
-export interface TlsCertificateProperties {
-  /**
-   * The type of certificate location.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly type?: CertificateType;
-  /**
-   * Indicates the location of the certificates.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly location?: string;
-}
-
-/** The logging properties of the connected registry. */
-export interface LoggingProperties {
-  /** The verbosity of logs persisted on the connected registry. */
-  logLevel?: LogLevel;
-  /** Indicates whether audit logs are enabled on the connected registry. */
-  auditLogStatus?: AuditLogStatus;
-}
-
-/** The status detail properties of the connected registry. */
-export interface StatusDetailProperties {
-  /**
-   * The component of the connected registry corresponding to the status.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly type?: string;
-  /**
-   * The code of the status.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly code?: string;
-  /**
-   * The description of the status.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly description?: string;
-  /**
-   * The timestamp of the status.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly timestamp?: Date;
-  /**
-   * The correlation ID of the status.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly correlationId?: string;
-}
-
-/** An error response from the Azure Container Registry service. */
-export interface ErrorResponse {
-  /** Azure container registry build API error body. */
-  error?: ErrorResponseBody;
-}
-
-/** An error response from the Azure Container Registry service. */
-export interface ErrorResponseBody {
-  /** error code. */
-  code: string;
-  /** error message. */
-  message: string;
-  /** target of the particular error. */
-  target?: string;
-  /** an array of additional nested error response info objects, as described by this contract. */
-  details?: InnerErrorDescription;
-}
-
-/** inner error. */
-export interface InnerErrorDescription {
-  /** error code. */
-  code: string;
-  /** error message. */
-  message: string;
-  /** target of the particular error. */
-  target?: string;
-}
-
-/** The parameters for updating a connected registry. */
-export interface ConnectedRegistryUpdateParameters {
-  /** The sync properties of the connected registry with its parent. */
-  syncProperties?: SyncUpdateProperties;
-  /** The logging properties of the connected registry. */
-  logging?: LoggingProperties;
-  /** The list of the ACR token resource IDs used to authenticate clients to the connected registry. */
-  clientTokenIds?: string[];
-  /** The list of notifications subscription information for the connected registry. */
-  notificationsList?: string[];
-}
-
-/** The parameters for updating the sync properties of the connected registry with its parent. */
-export interface SyncUpdateProperties {
-  /** The cron expression indicating the schedule that the connected registry will sync with its parent. */
-  schedule?: string;
-  /** The time window during which sync is enabled for each schedule occurrence. Specify the duration using the format P[n]Y[n]M[n]DT[n]H[n]M[n]S as per ISO8601. */
-  syncWindow?: string;
-  /** The period of time for which a message is available to sync before it is expired. Specify the duration using the format P[n]Y[n]M[n]DT[n]H[n]M[n]S as per ISO8601. */
-  messageTtl?: string;
-}
-
-/** The result of a request to list export pipelines for a container registry. */
-export interface ExportPipelineListResult {
-  /** The list of export pipelines. Since this list may be incomplete, the nextLink field should be used to request the next list of export pipelines. */
-  value?: ExportPipeline[];
-  /** The URI that can be used to request the next list of pipeline runs. */
-  nextLink?: string;
-}
-
-/** Managed identity for the resource. */
-export interface IdentityProperties {
-  /** The principal ID of resource identity. */
-  principalId?: string;
-  /** The tenant ID of resource. */
-  tenantId?: string;
-  /** The identity type. */
-  type?: ResourceIdentityType;
-  /**
-   * The list of user identities associated with the resource. The user identity
-   * dictionary key references will be ARM resource ids in the form:
-   * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/
-   *     providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
-   */
-  userAssignedIdentities?: { [propertyName: string]: UserIdentityProperties };
-}
-
-export interface UserIdentityProperties {
-  /** The principal id of user assigned identity. */
-  principalId?: string;
-  /** The client id of user assigned identity. */
-  clientId?: string;
-}
-
-/** The properties of the export pipeline target. */
-export interface ExportPipelineTargetProperties {
-  /** The type of target for the export pipeline. */
-  type?: string;
-  /**
-   * The target uri of the export pipeline.
-   * When 'AzureStorageBlob': "https://accountName.blob.core.windows.net/containerName/blobName"
-   * When 'AzureStorageBlobContainer':  "https://accountName.blob.core.windows.net/containerName"
-   */
-  uri?: string;
-  /** They key vault secret uri to obtain the target storage SAS token. */
-  keyVaultUri: string;
-}
-
 export interface ImportImageParameters {
   /** The source of the image. */
   source: ImportSource;
@@ -321,38 +59,6 @@ export interface ImportSourceCredentials {
   password: string;
 }
 
-/** The result of a request to list import pipelines for a container registry. */
-export interface ImportPipelineListResult {
-  /** The list of import pipelines. Since this list may be incomplete, the nextLink field should be used to request the next list of import pipelines. */
-  value?: ImportPipeline[];
-  /** The URI that can be used to request the next list of pipeline runs. */
-  nextLink?: string;
-}
-
-/** The properties of the import pipeline source. */
-export interface ImportPipelineSourceProperties {
-  /** The type of source for the import pipeline. */
-  type?: PipelineSourceType;
-  /**
-   * The source uri of the import pipeline.
-   * When 'AzureStorageBlob': "https://accountName.blob.core.windows.net/containerName/blobName"
-   * When 'AzureStorageBlobContainer': "https://accountName.blob.core.windows.net/containerName"
-   */
-  uri?: string;
-  /** They key vault secret uri to obtain the source storage SAS token. */
-  keyVaultUri: string;
-}
-
-export interface PipelineTriggerProperties {
-  /** The source trigger properties of the pipeline. */
-  sourceTrigger?: PipelineSourceTriggerProperties;
-}
-
-export interface PipelineSourceTriggerProperties {
-  /** The current status of the source trigger. */
-  status: TriggerStatus;
-}
-
 /** The result of a request to list container registry operations. */
 export interface OperationListResult {
   /** The list of container registry operations. Since this list may be incomplete, the nextLink field should be used to request the next list of operations. */
@@ -442,86 +148,6 @@ export interface RegistryNameStatus {
   message?: string;
 }
 
-/** The result of a request to list pipeline runs for a container registry. */
-export interface PipelineRunListResult {
-  /** The list of pipeline runs. Since this list may be incomplete, the nextLink field should be used to request the next list of pipeline runs. */
-  value?: PipelineRun[];
-  /** The URI that can be used to request the next list of pipeline runs. */
-  nextLink?: string;
-}
-
-/** The request properties provided for a pipeline run. */
-export interface PipelineRunRequest {
-  /** The resource ID of the pipeline to run. */
-  pipelineResourceId?: string;
-  /**
-   * List of source artifacts to be transferred by the pipeline.
-   * Specify an image by repository ('hello-world'). This will use the 'latest' tag.
-   * Specify an image by tag ('hello-world:latest').
-   * Specify an image by sha256-based manifest digest ('hello-world@sha256:abc123').
-   */
-  artifacts?: string[];
-  /** The source properties of the pipeline run. */
-  source?: PipelineRunSourceProperties;
-  /** The target properties of the pipeline run. */
-  target?: PipelineRunTargetProperties;
-  /** The digest of the tar used to transfer the artifacts. */
-  catalogDigest?: string;
-}
-
-export interface PipelineRunSourceProperties {
-  /** The type of the source. */
-  type?: PipelineRunSourceType;
-  /** The name of the source. */
-  name?: string;
-}
-
-export interface PipelineRunTargetProperties {
-  /** The type of the target. */
-  type?: PipelineRunTargetType;
-  /** The name of the target. */
-  name?: string;
-}
-
-/** The response properties returned for a pipeline run. */
-export interface PipelineRunResponse {
-  /** The current status of the pipeline run. */
-  status?: string;
-  /** The artifacts imported in the pipeline run. */
-  importedArtifacts?: string[];
-  /** The current progress of the copy operation. */
-  progress?: ProgressProperties;
-  /** The time the pipeline run started. */
-  startTime?: Date;
-  /** The time the pipeline run finished. */
-  finishTime?: Date;
-  /** The source of the pipeline run. */
-  source?: ImportPipelineSourceProperties;
-  /** The target of the pipeline run. */
-  target?: ExportPipelineTargetProperties;
-  /** The digest of the tar used to transfer the artifacts. */
-  catalogDigest?: string;
-  /** The trigger that caused the pipeline run. */
-  trigger?: PipelineTriggerDescriptor;
-  /** The detailed error message for the pipeline run in the case of failure. */
-  pipelineRunErrorMessage?: string;
-}
-
-export interface ProgressProperties {
-  /** The percentage complete of the copy operation. */
-  percentage?: string;
-}
-
-export interface PipelineTriggerDescriptor {
-  /** The source trigger that caused the pipeline run. */
-  sourceTrigger?: PipelineSourceTriggerDescriptor;
-}
-
-export interface PipelineSourceTriggerDescriptor {
-  /** The timestamp when the source update happened. */
-  timestamp?: Date;
-}
-
 /** The result of a request to list private endpoint connections for a container registry. */
 export interface PrivateEndpointConnectionListResult {
   /** The list of private endpoint connections. Since this list may be incomplete, the nextLink field should be used to request the next list of private endpoint connections. */
@@ -546,16 +172,8 @@ export interface PrivateLinkServiceConnectionState {
   actionsRequired?: ActionsRequired;
 }
 
-/** The result of a request to list container registries. */
-export interface RegistryListResult {
-  /** The list of container registries. Since this list may be incomplete, the nextLink field should be used to request the next list of container registries. */
-  value?: Registry[];
-  /** The URI that can be used to request the next list of container registries. */
-  nextLink?: string;
-}
-
-/** An Azure resource. */
-export interface Resource {
+/** The resource model definition for a ARM proxy resource. It will have everything other than required location and tags. */
+export interface ProxyResource {
   /**
    * The resource ID.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -571,10 +189,6 @@ export interface Resource {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly type?: string;
-  /** The location of the resource. This cannot be changed after the resource is created. */
-  location: string;
-  /** The tags of the resource. */
-  tags?: { [propertyName: string]: string };
   /**
    * Metadata pertaining to creation and last modification of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -582,6 +196,30 @@ export interface Resource {
   readonly systemData?: SystemData;
 }
 
+/** Metadata pertaining to creation and last modification of the resource. */
+export interface SystemData {
+  /** The identity that created the resource. */
+  createdBy?: string;
+  /** The type of identity that created the resource. */
+  createdByType?: CreatedByType;
+  /** The timestamp of resource creation (UTC). */
+  createdAt?: Date;
+  /** The identity that last modified the resource. */
+  lastModifiedBy?: string;
+  /** The type of identity that last modified the resource. */
+  lastModifiedByType?: LastModifiedByType;
+  /** The timestamp of resource modification (UTC). */
+  lastModifiedAt?: Date;
+}
+
+/** The result of a request to list container registries. */
+export interface RegistryListResult {
+  /** The list of container registries. Since this list may be incomplete, the nextLink field should be used to request the next list of container registries. */
+  value?: Registry[];
+  /** The URI that can be used to request the next list of container registries. */
+  nextLink?: string;
+}
+
 /** The SKU of a container registry. */
 export interface Sku {
   /** The SKU name of the container registry. Required for registry creation. */
@@ -593,6 +231,30 @@ export interface Sku {
   readonly tier?: SkuTier;
 }
 
+/** Managed identity for the resource. */
+export interface IdentityProperties {
+  /** The principal ID of resource identity. */
+  principalId?: string;
+  /** The tenant ID of resource. */
+  tenantId?: string;
+  /** The identity type. */
+  type?: ResourceIdentityType;
+  /**
+   * The list of user identities associated with the resource. The user identity
+   * dictionary key references will be ARM resource ids in the form:
+   * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/
+   *     providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+   */
+  userAssignedIdentities?: { [propertyName: string]: UserIdentityProperties };
+}
+
+export interface UserIdentityProperties {
+  /** The principal id of user assigned identity. */
+  principalId?: string;
+  /** The client id of user assigned identity. */
+  clientId?: string;
+}
+
 /** The status of an Azure resource at the time the operation was called. */
 export interface Status {
   /**
@@ -616,20 +278,10 @@ export interface Status {
 export interface NetworkRuleSet {
   /** The default action of allow or deny when no other rules match. */
   defaultAction: DefaultAction;
-  /** The virtual network rules. */
-  virtualNetworkRules?: VirtualNetworkRule[];
   /** The IP ACL rules. */
   ipRules?: IPRule[];
 }
 
-/** Virtual network rule. */
-export interface VirtualNetworkRule {
-  /** The action of virtual network rule. */
-  action?: Action;
-  /** Resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}. */
-  virtualNetworkResourceId: string;
-}
-
 /** IP rule with specific IP or IP range in CIDR format. */
 export interface IPRule {
   /** The action of IP ACL rule. */
@@ -712,6 +364,34 @@ export interface KeyVaultProperties {
   readonly lastKeyRotationTimestamp?: Date;
 }
 
+/** An Azure resource. */
+export interface Resource {
+  /**
+   * The resource ID.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly id?: string;
+  /**
+   * The name of the resource.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly name?: string;
+  /**
+   * The type of the resource.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly type?: string;
+  /** The location of the resource. This cannot be changed after the resource is created. */
+  location: string;
+  /** The tags of the resource. */
+  tags?: { [propertyName: string]: string };
+  /**
+   * Metadata pertaining to creation and last modification of the resource.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly systemData?: SystemData;
+}
+
 /** The parameters for updating a container registry. */
 export interface RegistryUpdateParameters {
   /** The identity of the container registry. */
@@ -734,8 +414,6 @@ export interface RegistryUpdateParameters {
   publicNetworkAccess?: PublicNetworkAccess;
   /** Whether to allow trusted Azure services to access a network restricted registry. */
   networkRuleBypassOptions?: NetworkRuleBypassOptions;
-  /** Enables registry-wide pull from unauthenticated clients. */
-  anonymousPullEnabled?: boolean;
 }
 
 /** The result of a request to get container registry quota usages. */
@@ -783,6 +461,34 @@ export interface PrivateLinkResource {
   requiredZoneNames?: string[];
 }
 
+/** An error response from the Azure Container Registry service. */
+export interface ErrorResponse {
+  /** Azure container registry build API error body. */
+  error?: ErrorResponseBody;
+}
+
+/** An error response from the Azure Container Registry service. */
+export interface ErrorResponseBody {
+  /** error code. */
+  code: string;
+  /** error message. */
+  message: string;
+  /** target of the particular error. */
+  target?: string;
+  /** an array of additional nested error response info objects, as described by this contract. */
+  details?: InnerErrorDescription[];
+}
+
+/** inner error. */
+export interface InnerErrorDescription {
+  /** error code. */
+  code: string;
+  /** error message. */
+  message: string;
+  /** target of the particular error. */
+  target?: string;
+}
+
 /** The response from the ListCredentials operation. */
 export interface RegistryListCredentialsResult {
   /** The username for a container registry. */
@@ -821,94 +527,6 @@ export interface ReplicationUpdateParameters {
   regionEndpointEnabled?: boolean;
 }
 
-/** The result of a request to list scope maps for a container registry. */
-export interface ScopeMapListResult {
-  /** The list of scope maps. Since this list may be incomplete, the nextLink field should be used to request the next list of scope maps. */
-  value?: ScopeMap[];
-  /** The URI that can be used to request the next list of scope maps. */
-  nextLink?: string;
-}
-
-/** The properties for updating the scope map. */
-export interface ScopeMapUpdateParameters {
-  /** The user friendly description of the scope map. */
-  description?: string;
-  /**
-   * The list of scope permissions for registry artifacts.
-   * E.g. repositories/repository-name/pull,
-   * repositories/repository-name/delete
-   */
-  actions?: string[];
-}
-
-/** The result of a request to list tokens for a container registry. */
-export interface TokenListResult {
-  /** The list of tokens. Since this list may be incomplete, the nextLink field should be used to request the next list of tokens. */
-  value?: Token[];
-  /** The URI that can be used to request the next list of tokens. */
-  nextLink?: string;
-}
-
-/** The properties of the credentials that can be used for authenticating the token. */
-export interface TokenCredentialsProperties {
-  certificates?: TokenCertificate[];
-  passwords?: TokenPassword[];
-}
-
-/** The properties of a certificate used for authenticating a token. */
-export interface TokenCertificate {
-  name?: TokenCertificateName;
-  /** The expiry datetime of the certificate. */
-  expiry?: Date;
-  /** The thumbprint of the certificate. */
-  thumbprint?: string;
-  /** Base 64 encoded string of the public certificate1 in PEM format that will be used for authenticating the token. */
-  encodedPemCertificate?: string;
-}
-
-/** The password that will be used for authenticating the token of a container registry. */
-export interface TokenPassword {
-  /** The creation datetime of the password. */
-  creationTime?: Date;
-  /** The expiry datetime of the password. */
-  expiry?: Date;
-  /** The password name "password1" or "password2" */
-  name?: TokenPasswordName;
-  /**
-   * The password value.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly value?: string;
-}
-
-/** The parameters for updating a token. */
-export interface TokenUpdateParameters {
-  /** The resource ID of the scope map to which the token will be associated with. */
-  scopeMapId?: string;
-  /** The status of the token example enabled or disabled. */
-  status?: TokenStatus;
-  /** The credentials that can be used for authenticating the token. */
-  credentials?: TokenCredentialsProperties;
-}
-
-/** The parameters used to generate credentials for a specified token or user of a container registry. */
-export interface GenerateCredentialsParameters {
-  /** The resource ID of the token for which credentials have to be generated. */
-  tokenId?: string;
-  /** The expiry date of the generated credentials after which the credentials become invalid. */
-  expiry?: Date;
-  /** Specifies name of the password which should be regenerated if any -- password1 or password2. */
-  name?: TokenPasswordName;
-}
-
-/** The response from the GenerateCredentials operation. */
-export interface GenerateCredentialsResult {
-  /** The username for a container registry. */
-  username?: string;
-  /** The list of passwords for a container registry. */
-  passwords?: TokenPassword[];
-}
-
 /** The result of a request to list webhooks for a container registry. */
 export interface WebhookListResult {
   /** The list of webhooks. Since this list may be incomplete, the nextLink field should be used to request the next list of webhooks. */
@@ -1511,12 +1129,21 @@ export interface BaseImageTriggerUpdateParameters {
   name: string;
 }
 
-/** The Active Directory Object that will be used for authenticating the token of a container registry. */
-export interface ActiveDirectoryObject {
-  /** The user/group/application object ID for Active Directory Object that will be used for authenticating the token of a container registry. */
-  objectId?: string;
-  /** The tenant ID of user/group/application object Active Directory Object that will be used for authenticating the token of a container registry. */
-  tenantId?: string;
+/** The properties of a storage account for a container registry. Only applicable to Classic SKU. */
+export interface StorageAccountProperties {
+  /** The resource ID of the storage account. */
+  id: string;
+}
+
+/** The properties of a package type. */
+export interface PackageType {
+  /** The name of the package type. */
+  name?: string;
+  /**
+   * The endpoint of the package type.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly endpoint?: string;
 }
 
 /** Properties that are enabled for Odata querying on runs. */
@@ -1558,129 +1185,29 @@ export interface Argument {
 export interface SetValue {
   /** The name of the overridable value. */
   name: string;
-  /** The overridable value. */
-  value: string;
-  /** Flag to indicate whether the value represents a secret or not. */
-  isSecret?: boolean;
-}
-
-export interface OverrideTaskStepProperties {
-  /** The source context against which run has to be queued. */
-  contextPath?: string;
-  /** The file against which run has to be queued. */
-  file?: string;
-  /**
-   * Gets or sets the collection of override arguments to be used when
-   * executing a build step.
-   */
-  arguments?: Argument[];
-  /** The name of the target build stage for the docker build. */
-  target?: string;
-  /** The collection of overridable values that can be passed when running a Task. */
-  values?: SetValue[];
-  /** Base64 encoded update trigger token that will be attached with the base image trigger webhook. */
-  updateTriggerToken?: string;
-}
-
-/** An object that represents a connected registry for a container registry. */
-export type ConnectedRegistry = ProxyResource & {
-  /**
-   * Provisioning state of the resource.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-  /** The mode of the connected registry resource that indicates the permissions of the registry. */
-  mode?: ConnectedRegistryMode;
-  /**
-   * The current version of ACR runtime on the connected registry.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly version?: string;
-  /**
-   * The current connection state of the connected registry.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly connectionState?: ConnectionState;
-  /**
-   * The last activity time of the connected registry.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly lastActivityTime?: Date;
-  /**
-   * The activation properties of the connected registry.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly activation?: ActivationProperties;
-  /** The parent of the connected registry. */
-  parent?: ParentProperties;
-  /** The list of the ACR token resource IDs used to authenticate clients to the connected registry. */
-  clientTokenIds?: string[];
-  /** The login server properties of the connected registry. */
-  loginServer?: LoginServerProperties;
-  /** The logging properties of the connected registry. */
-  logging?: LoggingProperties;
-  /**
-   * The list of current statuses of the connected registry.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly statusDetails?: StatusDetailProperties[];
-  /** The list of notifications subscription information for the connected registry. */
-  notificationsList?: string[];
-};
-
-/** An object that represents an export pipeline for a container registry. */
-export type ExportPipeline = ProxyResource & {
-  /** The location of the export pipeline. */
-  location?: string;
-  /** The identity of the export pipeline. */
-  identity?: IdentityProperties;
-  /** The target properties of the export pipeline. */
-  target?: ExportPipelineTargetProperties;
-  /** The list of all options configured for the pipeline. */
-  options?: PipelineOptions[];
-  /**
-   * The provisioning state of the pipeline at the time the operation was called.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-};
-
-/** An object that represents an import pipeline for a container registry. */
-export type ImportPipeline = ProxyResource & {
-  /** The location of the import pipeline. */
-  location?: string;
-  /** The identity of the import pipeline. */
-  identity?: IdentityProperties;
-  /** The source properties of the import pipeline. */
-  source?: ImportPipelineSourceProperties;
-  /** The properties that describe the trigger of the import pipeline. */
-  trigger?: PipelineTriggerProperties;
-  /** The list of all options configured for the pipeline. */
-  options?: PipelineOptions[];
-  /**
-   * The provisioning state of the pipeline at the time the operation was called.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-};
+  /** The overridable value. */
+  value: string;
+  /** Flag to indicate whether the value represents a secret or not. */
+  isSecret?: boolean;
+}
 
-/** An object that represents a pipeline run for a container registry. */
-export type PipelineRun = ProxyResource & {
-  /**
-   * The provisioning state of a pipeline run.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-  /** The request parameters for a pipeline run. */
-  request?: PipelineRunRequest;
+export interface OverrideTaskStepProperties {
+  /** The source context against which run has to be queued. */
+  contextPath?: string;
+  /** The file against which run has to be queued. */
+  file?: string;
   /**
-   * The response of a pipeline run.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
+   * Gets or sets the collection of override arguments to be used when
+   * executing a build step.
    */
-  readonly response?: PipelineRunResponse;
-  /** How the pipeline run should be forced to recreate even if the pipeline run configuration has not changed. */
-  forceUpdateTag?: string;
-};
+  arguments?: Argument[];
+  /** The name of the target build stage for the docker build. */
+  target?: string;
+  /** The collection of overridable values that can be passed when running a Task. */
+  values?: SetValue[];
+  /** Base64 encoded update trigger token that will be attached with the base image trigger webhook. */
+  updateTriggerToken?: string;
+}
 
 /** An object that represents a private endpoint connection for a container registry. */
 export type PrivateEndpointConnection = ProxyResource & {
@@ -1695,53 +1222,6 @@ export type PrivateEndpointConnection = ProxyResource & {
   readonly provisioningState?: ProvisioningState;
 };
 
-/** An object that represents a scope map for a container registry. */
-export type ScopeMap = ProxyResource & {
-  /** The user friendly description of the scope map. */
-  description?: string;
-  /**
-   * The type of the scope map. E.g. BuildIn scope map.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly typePropertiesType?: string;
-  /**
-   * The creation date of scope map.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly creationDate?: Date;
-  /**
-   * Provisioning state of the resource.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-  /**
-   * The list of scoped permissions for registry artifacts.
-   * E.g. repositories/repository-name/content/read,
-   * repositories/repository-name/metadata/write
-   */
-  actions?: string[];
-};
-
-/** An object that represents a token for a container registry. */
-export type Token = ProxyResource & {
-  /**
-   * The creation date of scope map.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly creationDate?: Date;
-  /**
-   * Provisioning state of the resource.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-  /** The resource ID of the scope map to which the token will be associated with. */
-  scopeMapId?: string;
-  /** The credentials that can be used for authenticating the token. */
-  credentials?: TokenCredentialsProperties;
-  /** The status of the token example enabled or disabled. */
-  status?: TokenStatus;
-};
-
 /** Run resource properties */
 export type Run = ProxyResource & {
   /** The unique identifier for the run. */
@@ -1873,8 +1353,6 @@ export type Registry = Resource & {
   networkRuleBypassOptions?: NetworkRuleBypassOptions;
   /** Whether or not zone redundancy is enabled for this container registry */
   zoneRedundancy?: ZoneRedundancy;
-  /** Enables registry-wide pull from unauthenticated clients. */
-  anonymousPullEnabled?: boolean;
 };
 
 /** An object that represents a replication for a container registry. */
@@ -2051,314 +1529,106 @@ export type EncodedTaskRunRequest = RunRequest & {
   encodedTaskContent: string;
   /** Base64 encoded value of the parameters/values file content. */
   encodedValuesContent?: string;
-  /** The collection of overridable values that can be passed when running a task. */
-  values?: SetValue[];
-  /** Run timeout in seconds. */
-  timeout?: number;
-  /** The platform properties against which the run has to happen. */
-  platform: PlatformProperties;
-  /** The machine configuration of the run agent. */
-  agentConfiguration?: AgentProperties;
-  /**
-   * The URL(absolute or relative) of the source context. It can be an URL to a tar or git repository.
-   * If it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.
-   */
-  sourceLocation?: string;
-  /** The properties that describes a set of credentials that will be used when this run is invoked. */
-  credentials?: Credentials;
-};
-
-/** The Docker build step. */
-export type DockerBuildStep = TaskStepProperties & {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "Docker";
-  /** The fully qualified image names including the repository and tag. */
-  imageNames?: string[];
-  /** The value of this property indicates whether the image built should be pushed to the registry or not. */
-  isPushEnabled?: boolean;
-  /** The value of this property indicates whether the image cache is enabled or not. */
-  noCache?: boolean;
-  /** The Docker file path relative to the source context. */
-  dockerFilePath: string;
-  /** The name of the target build stage for the docker build. */
-  target?: string;
-  /** The collection of override arguments to be used when executing this build step. */
-  arguments?: Argument[];
-};
-
-/** The properties of a task step. */
-export type FileTaskStep = TaskStepProperties & {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "FileTask";
-  /** The task template/definition file path relative to the source context. */
-  taskFilePath: string;
-  /** The task values/parameters file path relative to the source context. */
-  valuesFilePath?: string;
-  /** The collection of overridable values that can be passed when running a task. */
-  values?: SetValue[];
-};
-
-/** The properties of a encoded task step. */
-export type EncodedTaskStep = TaskStepProperties & {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "EncodedTask";
-  /** Base64 encoded value of the template/definition file content. */
-  encodedTaskContent: string;
-  /** Base64 encoded value of the parameters/values file content. */
-  encodedValuesContent?: string;
-  /** The collection of overridable values that can be passed when running a task. */
-  values?: SetValue[];
-};
-
-/** The properties for updating a docker build step. */
-export type DockerBuildStepUpdateParameters = TaskStepUpdateParameters & {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "Docker";
-  /** The fully qualified image names including the repository and tag. */
-  imageNames?: string[];
-  /** The value of this property indicates whether the image built should be pushed to the registry or not. */
-  isPushEnabled?: boolean;
-  /** The value of this property indicates whether the image cache is enabled or not. */
-  noCache?: boolean;
-  /** The Docker file path relative to the source context. */
-  dockerFilePath?: string;
-  /** The collection of override arguments to be used when executing this build step. */
-  arguments?: Argument[];
-  /** The name of the target build stage for the docker build. */
-  target?: string;
-};
-
-/** The properties of updating a task step. */
-export type FileTaskStepUpdateParameters = TaskStepUpdateParameters & {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "FileTask";
-  /** The task template/definition file path relative to the source context. */
-  taskFilePath?: string;
-  /** The values/parameters file path relative to the source context. */
-  valuesFilePath?: string;
-  /** The collection of overridable values that can be passed when running a task. */
-  values?: SetValue[];
-};
-
-/** The properties for updating encoded task step. */
-export type EncodedTaskStepUpdateParameters = TaskStepUpdateParameters & {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "EncodedTask";
-  /** Base64 encoded value of the template/definition file content. */
-  encodedTaskContent?: string;
-  /** Base64 encoded value of the parameters/values file content. */
-  encodedValuesContent?: string;
-  /** The collection of overridable values that can be passed when running a task. */
-  values?: SetValue[];
-};
-
-/** Known values of {@link CreatedByType} that the service accepts. */
-export enum KnownCreatedByType {
-  User = "User",
-  Application = "Application",
-  ManagedIdentity = "ManagedIdentity",
-  Key = "Key"
-}
-
-/**
- * Defines values for CreatedByType. \
- * {@link KnownCreatedByType} can be used interchangeably with CreatedByType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **User** \
- * **Application** \
- * **ManagedIdentity** \
- * **Key**
- */
-export type CreatedByType = string;
-
-/** Known values of {@link LastModifiedByType} that the service accepts. */
-export enum KnownLastModifiedByType {
-  User = "User",
-  Application = "Application",
-  ManagedIdentity = "ManagedIdentity",
-  Key = "Key"
-}
-
-/**
- * Defines values for LastModifiedByType. \
- * {@link KnownLastModifiedByType} can be used interchangeably with LastModifiedByType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **User** \
- * **Application** \
- * **ManagedIdentity** \
- * **Key**
- */
-export type LastModifiedByType = string;
-
-/** Known values of {@link ProvisioningState} that the service accepts. */
-export enum KnownProvisioningState {
-  Creating = "Creating",
-  Updating = "Updating",
-  Deleting = "Deleting",
-  Succeeded = "Succeeded",
-  Failed = "Failed",
-  Canceled = "Canceled"
-}
-
-/**
- * Defines values for ProvisioningState. \
- * {@link KnownProvisioningState} can be used interchangeably with ProvisioningState,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Creating** \
- * **Updating** \
- * **Deleting** \
- * **Succeeded** \
- * **Failed** \
- * **Canceled**
- */
-export type ProvisioningState = string;
-
-/** Known values of {@link ConnectedRegistryMode} that the service accepts. */
-export enum KnownConnectedRegistryMode {
-  ReadWrite = "ReadWrite",
-  ReadOnly = "ReadOnly",
-  Registry = "Registry",
-  Mirror = "Mirror"
-}
-
-/**
- * Defines values for ConnectedRegistryMode. \
- * {@link KnownConnectedRegistryMode} can be used interchangeably with ConnectedRegistryMode,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **ReadWrite** \
- * **ReadOnly** \
- * **Registry** \
- * **Mirror**
- */
-export type ConnectedRegistryMode = string;
-
-/** Known values of {@link ConnectionState} that the service accepts. */
-export enum KnownConnectionState {
-  Online = "Online",
-  Offline = "Offline",
-  Syncing = "Syncing",
-  Unhealthy = "Unhealthy"
-}
-
-/**
- * Defines values for ConnectionState. \
- * {@link KnownConnectionState} can be used interchangeably with ConnectionState,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Online** \
- * **Offline** \
- * **Syncing** \
- * **Unhealthy**
- */
-export type ConnectionState = string;
-
-/** Known values of {@link ActivationStatus} that the service accepts. */
-export enum KnownActivationStatus {
-  Active = "Active",
-  Inactive = "Inactive"
-}
-
-/**
- * Defines values for ActivationStatus. \
- * {@link KnownActivationStatus} can be used interchangeably with ActivationStatus,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Active** \
- * **Inactive**
- */
-export type ActivationStatus = string;
-
-/** Known values of {@link TlsStatus} that the service accepts. */
-export enum KnownTlsStatus {
-  Enabled = "Enabled",
-  Disabled = "Disabled"
-}
-
-/**
- * Defines values for TlsStatus. \
- * {@link KnownTlsStatus} can be used interchangeably with TlsStatus,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Enabled** \
- * **Disabled**
- */
-export type TlsStatus = string;
-
-/** Known values of {@link CertificateType} that the service accepts. */
-export enum KnownCertificateType {
-  LocalDirectory = "LocalDirectory"
-}
-
-/**
- * Defines values for CertificateType. \
- * {@link KnownCertificateType} can be used interchangeably with CertificateType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **LocalDirectory**
- */
-export type CertificateType = string;
+  /** The collection of overridable values that can be passed when running a task. */
+  values?: SetValue[];
+  /** Run timeout in seconds. */
+  timeout?: number;
+  /** The platform properties against which the run has to happen. */
+  platform: PlatformProperties;
+  /** The machine configuration of the run agent. */
+  agentConfiguration?: AgentProperties;
+  /**
+   * The URL(absolute or relative) of the source context. It can be an URL to a tar or git repository.
+   * If it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.
+   */
+  sourceLocation?: string;
+  /** The properties that describes a set of credentials that will be used when this run is invoked. */
+  credentials?: Credentials;
+};
 
-/** Known values of {@link LogLevel} that the service accepts. */
-export enum KnownLogLevel {
-  Debug = "Debug",
-  Information = "Information",
-  Warning = "Warning",
-  Error = "Error",
-  None = "None"
-}
+/** The Docker build step. */
+export type DockerBuildStep = TaskStepProperties & {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  type: "Docker";
+  /** The fully qualified image names including the repository and tag. */
+  imageNames?: string[];
+  /** The value of this property indicates whether the image built should be pushed to the registry or not. */
+  isPushEnabled?: boolean;
+  /** The value of this property indicates whether the image cache is enabled or not. */
+  noCache?: boolean;
+  /** The Docker file path relative to the source context. */
+  dockerFilePath: string;
+  /** The name of the target build stage for the docker build. */
+  target?: string;
+  /** The collection of override arguments to be used when executing this build step. */
+  arguments?: Argument[];
+};
 
-/**
- * Defines values for LogLevel. \
- * {@link KnownLogLevel} can be used interchangeably with LogLevel,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Debug** \
- * **Information** \
- * **Warning** \
- * **Error** \
- * **None**
- */
-export type LogLevel = string;
+/** The properties of a task step. */
+export type FileTaskStep = TaskStepProperties & {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  type: "FileTask";
+  /** The task template/definition file path relative to the source context. */
+  taskFilePath: string;
+  /** The task values/parameters file path relative to the source context. */
+  valuesFilePath?: string;
+  /** The collection of overridable values that can be passed when running a task. */
+  values?: SetValue[];
+};
 
-/** Known values of {@link AuditLogStatus} that the service accepts. */
-export enum KnownAuditLogStatus {
-  Enabled = "Enabled",
-  Disabled = "Disabled"
-}
+/** The properties of a encoded task step. */
+export type EncodedTaskStep = TaskStepProperties & {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  type: "EncodedTask";
+  /** Base64 encoded value of the template/definition file content. */
+  encodedTaskContent: string;
+  /** Base64 encoded value of the parameters/values file content. */
+  encodedValuesContent?: string;
+  /** The collection of overridable values that can be passed when running a task. */
+  values?: SetValue[];
+};
 
-/**
- * Defines values for AuditLogStatus. \
- * {@link KnownAuditLogStatus} can be used interchangeably with AuditLogStatus,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Enabled** \
- * **Disabled**
- */
-export type AuditLogStatus = string;
+/** The properties for updating a docker build step. */
+export type DockerBuildStepUpdateParameters = TaskStepUpdateParameters & {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  type: "Docker";
+  /** The fully qualified image names including the repository and tag. */
+  imageNames?: string[];
+  /** The value of this property indicates whether the image built should be pushed to the registry or not. */
+  isPushEnabled?: boolean;
+  /** The value of this property indicates whether the image cache is enabled or not. */
+  noCache?: boolean;
+  /** The Docker file path relative to the source context. */
+  dockerFilePath?: string;
+  /** The collection of override arguments to be used when executing this build step. */
+  arguments?: Argument[];
+  /** The name of the target build stage for the docker build. */
+  target?: string;
+};
 
-/** Known values of {@link PipelineOptions} that the service accepts. */
-export enum KnownPipelineOptions {
-  OverwriteTags = "OverwriteTags",
-  OverwriteBlobs = "OverwriteBlobs",
-  DeleteSourceBlobOnSuccess = "DeleteSourceBlobOnSuccess",
-  ContinueOnErrors = "ContinueOnErrors"
-}
+/** The properties of updating a task step. */
+export type FileTaskStepUpdateParameters = TaskStepUpdateParameters & {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  type: "FileTask";
+  /** The task template/definition file path relative to the source context. */
+  taskFilePath?: string;
+  /** The values/parameters file path relative to the source context. */
+  valuesFilePath?: string;
+  /** The collection of overridable values that can be passed when running a task. */
+  values?: SetValue[];
+};
 
-/**
- * Defines values for PipelineOptions. \
- * {@link KnownPipelineOptions} can be used interchangeably with PipelineOptions,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **OverwriteTags** \
- * **OverwriteBlobs** \
- * **DeleteSourceBlobOnSuccess** \
- * **ContinueOnErrors**
- */
-export type PipelineOptions = string;
+/** The properties for updating encoded task step. */
+export type EncodedTaskStepUpdateParameters = TaskStepUpdateParameters & {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  type: "EncodedTask";
+  /** Base64 encoded value of the template/definition file content. */
+  encodedTaskContent?: string;
+  /** Base64 encoded value of the parameters/values file content. */
+  encodedValuesContent?: string;
+  /** The collection of overridable values that can be passed when running a task. */
+  values?: SetValue[];
+};
 
 /** Known values of {@link ImportMode} that the service accepts. */
 export enum KnownImportMode {
@@ -2376,64 +1646,6 @@ export enum KnownImportMode {
  */
 export type ImportMode = string;
 
-/** Known values of {@link PipelineSourceType} that the service accepts. */
-export enum KnownPipelineSourceType {
-  AzureStorageBlobContainer = "AzureStorageBlobContainer"
-}
-
-/**
- * Defines values for PipelineSourceType. \
- * {@link KnownPipelineSourceType} can be used interchangeably with PipelineSourceType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **AzureStorageBlobContainer**
- */
-export type PipelineSourceType = string;
-
-/** Known values of {@link TriggerStatus} that the service accepts. */
-export enum KnownTriggerStatus {
-  Disabled = "Disabled",
-  Enabled = "Enabled"
-}
-
-/**
- * Defines values for TriggerStatus. \
- * {@link KnownTriggerStatus} can be used interchangeably with TriggerStatus,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Disabled** \
- * **Enabled**
- */
-export type TriggerStatus = string;
-
-/** Known values of {@link PipelineRunSourceType} that the service accepts. */
-export enum KnownPipelineRunSourceType {
-  AzureStorageBlob = "AzureStorageBlob"
-}
-
-/**
- * Defines values for PipelineRunSourceType. \
- * {@link KnownPipelineRunSourceType} can be used interchangeably with PipelineRunSourceType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **AzureStorageBlob**
- */
-export type PipelineRunSourceType = string;
-
-/** Known values of {@link PipelineRunTargetType} that the service accepts. */
-export enum KnownPipelineRunTargetType {
-  AzureStorageBlob = "AzureStorageBlob"
-}
-
-/**
- * Defines values for PipelineRunTargetType. \
- * {@link KnownPipelineRunTargetType} can be used interchangeably with PipelineRunTargetType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **AzureStorageBlob**
- */
-export type PipelineRunTargetType = string;
-
 /** Known values of {@link ConnectionStatus} that the service accepts. */
 export enum KnownConnectionStatus {
   Approved = "Approved",
@@ -2470,6 +1682,70 @@ export enum KnownActionsRequired {
  */
 export type ActionsRequired = string;
 
+/** Known values of {@link ProvisioningState} that the service accepts. */
+export enum KnownProvisioningState {
+  Creating = "Creating",
+  Updating = "Updating",
+  Deleting = "Deleting",
+  Succeeded = "Succeeded",
+  Failed = "Failed",
+  Canceled = "Canceled"
+}
+
+/**
+ * Defines values for ProvisioningState. \
+ * {@link KnownProvisioningState} can be used interchangeably with ProvisioningState,
+ *  this enum contains the known values that the service supports.
+ * ### Known values supported by the service
+ * **Creating** \
+ * **Updating** \
+ * **Deleting** \
+ * **Succeeded** \
+ * **Failed** \
+ * **Canceled**
+ */
+export type ProvisioningState = string;
+
+/** Known values of {@link CreatedByType} that the service accepts. */
+export enum KnownCreatedByType {
+  User = "User",
+  Application = "Application",
+  ManagedIdentity = "ManagedIdentity",
+  Key = "Key"
+}
+
+/**
+ * Defines values for CreatedByType. \
+ * {@link KnownCreatedByType} can be used interchangeably with CreatedByType,
+ *  this enum contains the known values that the service supports.
+ * ### Known values supported by the service
+ * **User** \
+ * **Application** \
+ * **ManagedIdentity** \
+ * **Key**
+ */
+export type CreatedByType = string;
+
+/** Known values of {@link LastModifiedByType} that the service accepts. */
+export enum KnownLastModifiedByType {
+  User = "User",
+  Application = "Application",
+  ManagedIdentity = "ManagedIdentity",
+  Key = "Key"
+}
+
+/**
+ * Defines values for LastModifiedByType. \
+ * {@link KnownLastModifiedByType} can be used interchangeably with LastModifiedByType,
+ *  this enum contains the known values that the service supports.
+ * ### Known values supported by the service
+ * **User** \
+ * **Application** \
+ * **ManagedIdentity** \
+ * **Key**
+ */
+export type LastModifiedByType = string;
+
 /** Known values of {@link SkuName} that the service accepts. */
 export enum KnownSkuName {
   Classic = "Classic",
@@ -2666,54 +1942,6 @@ export enum KnownRegistryUsageUnit {
  */
 export type RegistryUsageUnit = string;
 
-/** Known values of {@link TokenCertificateName} that the service accepts. */
-export enum KnownTokenCertificateName {
-  Certificate1 = "certificate1",
-  Certificate2 = "certificate2"
-}
-
-/**
- * Defines values for TokenCertificateName. \
- * {@link KnownTokenCertificateName} can be used interchangeably with TokenCertificateName,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **certificate1** \
- * **certificate2**
- */
-export type TokenCertificateName = string;
-
-/** Known values of {@link TokenPasswordName} that the service accepts. */
-export enum KnownTokenPasswordName {
-  Password1 = "password1",
-  Password2 = "password2"
-}
-
-/**
- * Defines values for TokenPasswordName. \
- * {@link KnownTokenPasswordName} can be used interchangeably with TokenPasswordName,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **password1** \
- * **password2**
- */
-export type TokenPasswordName = string;
-
-/** Known values of {@link TokenStatus} that the service accepts. */
-export enum KnownTokenStatus {
-  Enabled = "enabled",
-  Disabled = "disabled"
-}
-
-/**
- * Defines values for TokenStatus. \
- * {@link KnownTokenStatus} can be used interchangeably with TokenStatus,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **enabled** \
- * **disabled**
- */
-export type TokenStatus = string;
-
 /** Known values of {@link WebhookStatus} that the service accepts. */
 export enum KnownWebhookStatus {
   Enabled = "enabled",
@@ -2904,7 +2132,23 @@ export enum KnownBaseImageDependencyType {
  * **BuildTime** \
  * **RunTime**
  */
-export type BaseImageDependencyType = string;
+export type BaseImageDependencyType = string;
+
+/** Known values of {@link TriggerStatus} that the service accepts. */
+export enum KnownTriggerStatus {
+  Disabled = "Disabled",
+  Enabled = "Enabled"
+}
+
+/**
+ * Defines values for TriggerStatus. \
+ * {@link KnownTriggerStatus} can be used interchangeably with TriggerStatus,
+ *  this enum contains the known values that the service supports.
+ * ### Known values supported by the service
+ * **Disabled** \
+ * **Enabled**
+ */
+export type TriggerStatus = string;
 
 /** Known values of {@link SourceControlType} that the service accepts. */
 export enum KnownSourceControlType {
@@ -3026,117 +2270,6 @@ export type ResourceIdentityType =
 /** Defines values for PasswordName. */
 export type PasswordName = "password" | "password2";
 
-/** Optional parameters. */
-export interface ConnectedRegistriesListOptionalParams
-  extends coreClient.OperationOptions {
-  /** An OData filter expression that describes a subset of connectedRegistries to return. The parameters that can be filtered are parent.id (the resource id of the connectedRegistry parent), mode, and connectionState. The supported operator is eq. */
-  filter?: string;
-}
-
-/** Contains response data for the list operation. */
-export type ConnectedRegistriesListResponse = ConnectedRegistryListResult;
-
-/** Optional parameters. */
-export interface ConnectedRegistriesGetOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type ConnectedRegistriesGetResponse = ConnectedRegistry;
-
-/** Optional parameters. */
-export interface ConnectedRegistriesCreateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the create operation. */
-export type ConnectedRegistriesCreateResponse = ConnectedRegistry;
-
-/** Optional parameters. */
-export interface ConnectedRegistriesDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface ConnectedRegistriesUpdateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the update operation. */
-export type ConnectedRegistriesUpdateResponse = ConnectedRegistry;
-
-/** Optional parameters. */
-export interface ConnectedRegistriesDeactivateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface ConnectedRegistriesListNextOptionalParams
-  extends coreClient.OperationOptions {
-  /** An OData filter expression that describes a subset of connectedRegistries to return. The parameters that can be filtered are parent.id (the resource id of the connectedRegistry parent), mode, and connectionState. The supported operator is eq. */
-  filter?: string;
-}
-
-/** Contains response data for the listNext operation. */
-export type ConnectedRegistriesListNextResponse = ConnectedRegistryListResult;
-
-/** Optional parameters. */
-export interface ExportPipelinesListOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the list operation. */
-export type ExportPipelinesListResponse = ExportPipelineListResult;
-
-/** Optional parameters. */
-export interface ExportPipelinesGetOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type ExportPipelinesGetResponse = ExportPipeline;
-
-/** Optional parameters. */
-export interface ExportPipelinesCreateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the create operation. */
-export type ExportPipelinesCreateResponse = ExportPipeline;
-
-/** Optional parameters. */
-export interface ExportPipelinesDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface ExportPipelinesListNextOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the listNext operation. */
-export type ExportPipelinesListNextResponse = ExportPipelineListResult;
-
 /** Optional parameters. */
 export interface RegistriesImportImageOptionalParams
   extends coreClient.OperationOptions {
@@ -3221,6 +2354,13 @@ export interface RegistriesListPrivateLinkResourcesOptionalParams
 /** Contains response data for the listPrivateLinkResources operation. */
 export type RegistriesListPrivateLinkResourcesResponse = PrivateLinkResourceListResult;
 
+/** Optional parameters. */
+export interface RegistriesGetPrivateLinkResourceOptionalParams
+  extends coreClient.OperationOptions {}
+
+/** Contains response data for the getPrivateLinkResource operation. */
+export type RegistriesGetPrivateLinkResourceResponse = PrivateLinkResource;
+
 /** Optional parameters. */
 export interface RegistriesListCredentialsOptionalParams
   extends coreClient.OperationOptions {}
@@ -3235,18 +2375,6 @@ export interface RegistriesRegenerateCredentialOptionalParams
 /** Contains response data for the regenerateCredential operation. */
 export type RegistriesRegenerateCredentialResponse = RegistryListCredentialsResult;
 
-/** Optional parameters. */
-export interface RegistriesGenerateCredentialsOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the generateCredentials operation. */
-export type RegistriesGenerateCredentialsResponse = GenerateCredentialsResult;
-
 /** Optional parameters. */
 export interface RegistriesScheduleRunOptionalParams
   extends coreClient.OperationOptions {
@@ -3287,48 +2415,6 @@ export interface RegistriesListPrivateLinkResourcesNextOptionalParams
 /** Contains response data for the listPrivateLinkResourcesNext operation. */
 export type RegistriesListPrivateLinkResourcesNextResponse = PrivateLinkResourceListResult;
 
-/** Optional parameters. */
-export interface ImportPipelinesListOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the list operation. */
-export type ImportPipelinesListResponse = ImportPipelineListResult;
-
-/** Optional parameters. */
-export interface ImportPipelinesGetOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type ImportPipelinesGetResponse = ImportPipeline;
-
-/** Optional parameters. */
-export interface ImportPipelinesCreateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the create operation. */
-export type ImportPipelinesCreateResponse = ImportPipeline;
-
-/** Optional parameters. */
-export interface ImportPipelinesDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface ImportPipelinesListNextOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the listNext operation. */
-export type ImportPipelinesListNextResponse = ImportPipelineListResult;
-
 /** Optional parameters. */
 export interface OperationsListOptionalParams
   extends coreClient.OperationOptions {}
@@ -3343,48 +2429,6 @@ export interface OperationsListNextOptionalParams
 /** Contains response data for the listNext operation. */
 export type OperationsListNextResponse = OperationListResult;
 
-/** Optional parameters. */
-export interface PipelineRunsListOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the list operation. */
-export type PipelineRunsListResponse = PipelineRunListResult;
-
-/** Optional parameters. */
-export interface PipelineRunsGetOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type PipelineRunsGetResponse = PipelineRun;
-
-/** Optional parameters. */
-export interface PipelineRunsCreateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the create operation. */
-export type PipelineRunsCreateResponse = PipelineRun;
-
-/** Optional parameters. */
-export interface PipelineRunsDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface PipelineRunsListNextOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the listNext operation. */
-export type PipelineRunsListNextResponse = PipelineRunListResult;
-
 /** Optional parameters. */
 export interface PrivateEndpointConnectionsListOptionalParams
   extends coreClient.OperationOptions {}
@@ -3481,112 +2525,6 @@ export interface ReplicationsListNextOptionalParams
 /** Contains response data for the listNext operation. */
 export type ReplicationsListNextResponse = ReplicationListResult;
 
-/** Optional parameters. */
-export interface ScopeMapsListOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the list operation. */
-export type ScopeMapsListResponse = ScopeMapListResult;
-
-/** Optional parameters. */
-export interface ScopeMapsGetOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type ScopeMapsGetResponse = ScopeMap;
-
-/** Optional parameters. */
-export interface ScopeMapsCreateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the create operation. */
-export type ScopeMapsCreateResponse = ScopeMap;
-
-/** Optional parameters. */
-export interface ScopeMapsDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface ScopeMapsUpdateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the update operation. */
-export type ScopeMapsUpdateResponse = ScopeMap;
-
-/** Optional parameters. */
-export interface ScopeMapsListNextOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the listNext operation. */
-export type ScopeMapsListNextResponse = ScopeMapListResult;
-
-/** Optional parameters. */
-export interface TokensListOptionalParams extends coreClient.OperationOptions {}
-
-/** Contains response data for the list operation. */
-export type TokensListResponse = TokenListResult;
-
-/** Optional parameters. */
-export interface TokensGetOptionalParams extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type TokensGetResponse = Token;
-
-/** Optional parameters. */
-export interface TokensCreateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the create operation. */
-export type TokensCreateResponse = Token;
-
-/** Optional parameters. */
-export interface TokensDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Optional parameters. */
-export interface TokensUpdateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the update operation. */
-export type TokensUpdateResponse = Token;
-
-/** Optional parameters. */
-export interface TokensListNextOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the listNext operation. */
-export type TokensListNextResponse = TokenListResult;
-
 /** Optional parameters. */
 export interface WebhooksListOptionalParams
   extends coreClient.OperationOptions {}
diff --git a/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts b/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts
index f73e7c468a41..77b66cfc1f40 100644
--- a/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts
@@ -8,25 +8,43 @@
 
 import * as coreClient from "@azure/core-client";
 
-export const ConnectedRegistryListResult: coreClient.CompositeMapper = {
+export const ImportImageParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ConnectedRegistryListResult",
+    className: "ImportImageParameters",
     modelProperties: {
-      value: {
-        serializedName: "value",
+      source: {
+        serializedName: "source",
+        type: {
+          name: "Composite",
+          className: "ImportSource"
+        }
+      },
+      targetTags: {
+        serializedName: "targetTags",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "Composite",
-              className: "ConnectedRegistry"
+              name: "String"
             }
           }
         }
       },
-      nextLink: {
-        serializedName: "nextLink",
+      untaggedTargetRepositories: {
+        serializedName: "untaggedTargetRepositories",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      mode: {
+        defaultValue: "NoForce",
+        serializedName: "mode",
         type: {
           name: "String"
         }
@@ -35,96 +53,82 @@ export const ConnectedRegistryListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const ProxyResource: coreClient.CompositeMapper = {
+export const ImportSource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ProxyResource",
+    className: "ImportSource",
     modelProperties: {
-      id: {
-        serializedName: "id",
-        readOnly: true,
+      resourceId: {
+        serializedName: "resourceId",
         type: {
           name: "String"
         }
       },
-      name: {
-        serializedName: "name",
-        readOnly: true,
+      registryUri: {
+        serializedName: "registryUri",
         type: {
           name: "String"
         }
       },
-      type: {
-        serializedName: "type",
-        readOnly: true,
+      credentials: {
+        serializedName: "credentials",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ImportSourceCredentials"
         }
       },
-      systemData: {
-        serializedName: "systemData",
+      sourceImage: {
+        serializedName: "sourceImage",
+        required: true,
         type: {
-          name: "Composite",
-          className: "SystemData"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const SystemData: coreClient.CompositeMapper = {
+export const ImportSourceCredentials: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SystemData",
+    className: "ImportSourceCredentials",
     modelProperties: {
-      createdBy: {
-        serializedName: "createdBy",
-        type: {
-          name: "String"
-        }
-      },
-      createdByType: {
-        serializedName: "createdByType",
-        type: {
-          name: "String"
-        }
-      },
-      createdAt: {
-        serializedName: "createdAt",
-        type: {
-          name: "DateTime"
-        }
-      },
-      lastModifiedBy: {
-        serializedName: "lastModifiedBy",
+      username: {
+        serializedName: "username",
         type: {
           name: "String"
         }
       },
-      lastModifiedByType: {
-        serializedName: "lastModifiedByType",
+      password: {
+        serializedName: "password",
+        required: true,
         type: {
           name: "String"
         }
-      },
-      lastModifiedAt: {
-        serializedName: "lastModifiedAt",
-        type: {
-          name: "DateTime"
-        }
       }
     }
   }
 };
 
-export const ActivationProperties: coreClient.CompositeMapper = {
+export const OperationListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ActivationProperties",
+    className: "OperationListResult",
     modelProperties: {
-      status: {
-        serializedName: "status",
-        readOnly: true,
+      value: {
+        serializedName: "value",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "OperationDefinition"
+            }
+          }
+        }
+      },
+      nextLink: {
+        serializedName: "nextLink",
         type: {
           name: "String"
         }
@@ -133,69 +137,72 @@ export const ActivationProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const ParentProperties: coreClient.CompositeMapper = {
+export const OperationDefinition: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ParentProperties",
+    className: "OperationDefinition",
     modelProperties: {
-      id: {
-        serializedName: "id",
+      origin: {
+        serializedName: "origin",
+        type: {
+          name: "String"
+        }
+      },
+      name: {
+        serializedName: "name",
         type: {
           name: "String"
         }
       },
-      syncProperties: {
-        serializedName: "syncProperties",
+      display: {
+        serializedName: "display",
+        type: {
+          name: "Composite",
+          className: "OperationDisplayDefinition"
+        }
+      },
+      isDataAction: {
+        serializedName: "isDataAction",
+        type: {
+          name: "Boolean"
+        }
+      },
+      serviceSpecification: {
+        serializedName: "properties.serviceSpecification",
         type: {
           name: "Composite",
-          className: "SyncProperties"
+          className: "OperationServiceSpecificationDefinition"
         }
       }
     }
   }
 };
 
-export const SyncProperties: coreClient.CompositeMapper = {
+export const OperationDisplayDefinition: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SyncProperties",
+    className: "OperationDisplayDefinition",
     modelProperties: {
-      tokenId: {
-        serializedName: "tokenId",
-        required: true,
+      provider: {
+        serializedName: "provider",
         type: {
           name: "String"
         }
       },
-      schedule: {
-        serializedName: "schedule",
+      resource: {
+        serializedName: "resource",
         type: {
           name: "String"
         }
       },
-      syncWindow: {
-        serializedName: "syncWindow",
-        type: {
-          name: "TimeSpan"
-        }
-      },
-      messageTtl: {
-        serializedName: "messageTtl",
-        required: true,
-        type: {
-          name: "TimeSpan"
-        }
-      },
-      lastSyncTime: {
-        serializedName: "lastSyncTime",
-        readOnly: true,
+      operation: {
+        serializedName: "operation",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      gatewayEndpoint: {
-        serializedName: "gatewayEndpoint",
-        readOnly: true,
+      description: {
+        serializedName: "description",
         type: {
           name: "String"
         }
@@ -204,90 +211,76 @@ export const SyncProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const LoginServerProperties: coreClient.CompositeMapper = {
+export const OperationServiceSpecificationDefinition: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "LoginServerProperties",
+    className: "OperationServiceSpecificationDefinition",
     modelProperties: {
-      host: {
-        serializedName: "host",
-        readOnly: true,
+      metricSpecifications: {
+        serializedName: "metricSpecifications",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "OperationMetricSpecificationDefinition"
+            }
+          }
         }
       },
-      tls: {
-        serializedName: "tls",
+      logSpecifications: {
+        serializedName: "logSpecifications",
         type: {
-          name: "Composite",
-          className: "TlsProperties"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "OperationLogSpecificationDefinition"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const TlsProperties: coreClient.CompositeMapper = {
+export const OperationMetricSpecificationDefinition: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TlsProperties",
+    className: "OperationMetricSpecificationDefinition",
     modelProperties: {
-      status: {
-        serializedName: "status",
-        readOnly: true,
+      name: {
+        serializedName: "name",
         type: {
           name: "String"
         }
       },
-      certificate: {
-        serializedName: "certificate",
+      displayName: {
+        serializedName: "displayName",
         type: {
-          name: "Composite",
-          className: "TlsCertificateProperties"
+          name: "String"
         }
-      }
-    }
-  }
-};
-
-export const TlsCertificateProperties: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TlsCertificateProperties",
-    modelProperties: {
-      type: {
-        serializedName: "type",
-        readOnly: true,
+      },
+      displayDescription: {
+        serializedName: "displayDescription",
         type: {
           name: "String"
         }
       },
-      location: {
-        serializedName: "location",
-        readOnly: true,
+      unit: {
+        serializedName: "unit",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const LoggingProperties: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "LoggingProperties",
-    modelProperties: {
-      logLevel: {
-        defaultValue: "Information",
-        serializedName: "logLevel",
+      },
+      aggregationType: {
+        serializedName: "aggregationType",
         type: {
           name: "String"
         }
       },
-      auditLogStatus: {
-        defaultValue: "Disabled",
-        serializedName: "auditLogStatus",
+      internalMetricName: {
+        serializedName: "internalMetricName",
         type: {
           name: "String"
         }
@@ -296,42 +289,25 @@ export const LoggingProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const StatusDetailProperties: coreClient.CompositeMapper = {
+export const OperationLogSpecificationDefinition: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "StatusDetailProperties",
+    className: "OperationLogSpecificationDefinition",
     modelProperties: {
-      type: {
-        serializedName: "type",
-        readOnly: true,
+      name: {
+        serializedName: "name",
         type: {
           name: "String"
         }
       },
-      code: {
-        serializedName: "code",
-        readOnly: true,
+      displayName: {
+        serializedName: "displayName",
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "description",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      timestamp: {
-        serializedName: "timestamp",
-        readOnly: true,
-        type: {
-          name: "DateTime"
-        }
-      },
-      correlationId: {
-        serializedName: "correlationId",
-        readOnly: true,
+      blobDuration: {
+        serializedName: "blobDuration",
         type: {
           name: "String"
         }
@@ -340,79 +316,123 @@ export const StatusDetailProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const ErrorResponse: coreClient.CompositeMapper = {
+export const RegistryNameCheckRequest: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ErrorResponse",
+    className: "RegistryNameCheckRequest",
     modelProperties: {
-      error: {
-        serializedName: "error",
+      name: {
+        constraints: {
+          Pattern: new RegExp("^[a-zA-Z0-9]*$"),
+          MaxLength: 50,
+          MinLength: 5
+        },
+        serializedName: "name",
+        required: true,
         type: {
-          name: "Composite",
-          className: "ErrorResponseBody"
+          name: "String"
+        }
+      },
+      type: {
+        defaultValue: "Microsoft.ContainerRegistry/registries",
+        isConstant: true,
+        serializedName: "type",
+        type: {
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ErrorResponseBody: coreClient.CompositeMapper = {
+export const RegistryNameStatus: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ErrorResponseBody",
+    className: "RegistryNameStatus",
     modelProperties: {
-      code: {
-        serializedName: "code",
-        required: true,
+      nameAvailable: {
+        serializedName: "nameAvailable",
+        type: {
+          name: "Boolean"
+        }
+      },
+      reason: {
+        serializedName: "reason",
         type: {
           name: "String"
         }
       },
       message: {
         serializedName: "message",
-        required: true,
         type: {
           name: "String"
         }
+      }
+    }
+  }
+};
+
+export const PrivateEndpointConnectionListResult: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "PrivateEndpointConnectionListResult",
+    modelProperties: {
+      value: {
+        serializedName: "value",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "PrivateEndpointConnection"
+            }
+          }
+        }
       },
-      target: {
-        serializedName: "target",
+      nextLink: {
+        serializedName: "nextLink",
         type: {
           name: "String"
         }
-      },
-      details: {
-        serializedName: "details",
+      }
+    }
+  }
+};
+
+export const PrivateEndpoint: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "PrivateEndpoint",
+    modelProperties: {
+      id: {
+        serializedName: "id",
         type: {
-          name: "Composite",
-          className: "InnerErrorDescription"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const InnerErrorDescription: coreClient.CompositeMapper = {
+export const PrivateLinkServiceConnectionState: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "InnerErrorDescription",
+    className: "PrivateLinkServiceConnectionState",
     modelProperties: {
-      code: {
-        serializedName: "code",
-        required: true,
+      status: {
+        serializedName: "status",
         type: {
           name: "String"
         }
       },
-      message: {
-        serializedName: "message",
-        required: true,
+      description: {
+        serializedName: "description",
         type: {
           name: "String"
         }
       },
-      target: {
-        serializedName: "target",
+      actionsRequired: {
+        serializedName: "actionsRequired",
         type: {
           name: "String"
         }
@@ -421,82 +441,92 @@ export const InnerErrorDescription: coreClient.CompositeMapper = {
   }
 };
 
-export const ConnectedRegistryUpdateParameters: coreClient.CompositeMapper = {
+export const ProxyResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ConnectedRegistryUpdateParameters",
+    className: "ProxyResource",
     modelProperties: {
-      syncProperties: {
-        serializedName: "properties.syncProperties",
+      id: {
+        serializedName: "id",
+        readOnly: true,
         type: {
-          name: "Composite",
-          className: "SyncUpdateProperties"
+          name: "String"
         }
       },
-      logging: {
-        serializedName: "properties.logging",
+      name: {
+        serializedName: "name",
+        readOnly: true,
         type: {
-          name: "Composite",
-          className: "LoggingProperties"
+          name: "String"
         }
       },
-      clientTokenIds: {
-        serializedName: "properties.clientTokenIds",
+      type: {
+        serializedName: "type",
+        readOnly: true,
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      notificationsList: {
-        serializedName: "properties.notificationsList",
+      systemData: {
+        serializedName: "systemData",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "Composite",
+          className: "SystemData"
         }
       }
     }
   }
 };
 
-export const SyncUpdateProperties: coreClient.CompositeMapper = {
+export const SystemData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SyncUpdateProperties",
+    className: "SystemData",
     modelProperties: {
-      schedule: {
-        serializedName: "schedule",
+      createdBy: {
+        serializedName: "createdBy",
+        type: {
+          name: "String"
+        }
+      },
+      createdByType: {
+        serializedName: "createdByType",
+        type: {
+          name: "String"
+        }
+      },
+      createdAt: {
+        serializedName: "createdAt",
+        type: {
+          name: "DateTime"
+        }
+      },
+      lastModifiedBy: {
+        serializedName: "lastModifiedBy",
         type: {
           name: "String"
         }
       },
-      syncWindow: {
-        serializedName: "syncWindow",
+      lastModifiedByType: {
+        serializedName: "lastModifiedByType",
         type: {
-          name: "TimeSpan"
+          name: "String"
         }
       },
-      messageTtl: {
-        serializedName: "messageTtl",
+      lastModifiedAt: {
+        serializedName: "lastModifiedAt",
         type: {
-          name: "TimeSpan"
+          name: "DateTime"
         }
       }
     }
   }
 };
 
-export const ExportPipelineListResult: coreClient.CompositeMapper = {
+export const RegistryListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ExportPipelineListResult",
+    className: "RegistryListResult",
     modelProperties: {
       value: {
         serializedName: "value",
@@ -505,7 +535,7 @@ export const ExportPipelineListResult: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "ExportPipeline"
+              className: "Registry"
             }
           }
         }
@@ -520,6 +550,29 @@ export const ExportPipelineListResult: coreClient.CompositeMapper = {
   }
 };
 
+export const Sku: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "Sku",
+    modelProperties: {
+      name: {
+        serializedName: "name",
+        required: true,
+        type: {
+          name: "String"
+        }
+      },
+      tier: {
+        serializedName: "tier",
+        readOnly: true,
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const IdentityProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -583,105 +636,79 @@ export const UserIdentityProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const ExportPipelineTargetProperties: coreClient.CompositeMapper = {
+export const Status: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ExportPipelineTargetProperties",
+    className: "Status",
     modelProperties: {
-      type: {
-        serializedName: "type",
+      displayStatus: {
+        serializedName: "displayStatus",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      uri: {
-        serializedName: "uri",
+      message: {
+        serializedName: "message",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      keyVaultUri: {
-        serializedName: "keyVaultUri",
-        required: true,
+      timestamp: {
+        serializedName: "timestamp",
+        readOnly: true,
         type: {
-          name: "String"
+          name: "DateTime"
         }
       }
     }
   }
 };
 
-export const ImportImageParameters: coreClient.CompositeMapper = {
+export const NetworkRuleSet: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImportImageParameters",
+    className: "NetworkRuleSet",
     modelProperties: {
-      source: {
-        serializedName: "source",
-        type: {
-          name: "Composite",
-          className: "ImportSource"
-        }
-      },
-      targetTags: {
-        serializedName: "targetTags",
+      defaultAction: {
+        defaultValue: "Allow",
+        serializedName: "defaultAction",
+        required: true,
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      untaggedTargetRepositories: {
-        serializedName: "untaggedTargetRepositories",
+      ipRules: {
+        serializedName: "ipRules",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "String"
+              name: "Composite",
+              className: "IPRule"
             }
           }
         }
-      },
-      mode: {
-        defaultValue: "NoForce",
-        serializedName: "mode",
-        type: {
-          name: "String"
-        }
       }
     }
   }
 };
 
-export const ImportSource: coreClient.CompositeMapper = {
+export const IPRule: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImportSource",
+    className: "IPRule",
     modelProperties: {
-      resourceId: {
-        serializedName: "resourceId",
-        type: {
-          name: "String"
-        }
-      },
-      registryUri: {
-        serializedName: "registryUri",
+      action: {
+        defaultValue: "Allow",
+        serializedName: "action",
         type: {
           name: "String"
         }
       },
-      credentials: {
-        serializedName: "credentials",
-        type: {
-          name: "Composite",
-          className: "ImportSourceCredentials"
-        }
-      },
-      sourceImage: {
-        serializedName: "sourceImage",
+      iPAddressOrRange: {
+        serializedName: "value",
         required: true,
         type: {
           name: "String"
@@ -691,47 +718,50 @@ export const ImportSource: coreClient.CompositeMapper = {
   }
 };
 
-export const ImportSourceCredentials: coreClient.CompositeMapper = {
+export const Policies: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImportSourceCredentials",
+    className: "Policies",
     modelProperties: {
-      username: {
-        serializedName: "username",
+      quarantinePolicy: {
+        serializedName: "quarantinePolicy",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "QuarantinePolicy"
         }
       },
-      password: {
-        serializedName: "password",
-        required: true,
+      trustPolicy: {
+        serializedName: "trustPolicy",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "TrustPolicy"
+        }
+      },
+      retentionPolicy: {
+        serializedName: "retentionPolicy",
+        type: {
+          name: "Composite",
+          className: "RetentionPolicy"
+        }
+      },
+      exportPolicy: {
+        serializedName: "exportPolicy",
+        type: {
+          name: "Composite",
+          className: "ExportPolicy"
         }
       }
     }
   }
 };
 
-export const ImportPipelineListResult: coreClient.CompositeMapper = {
+export const QuarantinePolicy: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImportPipelineListResult",
+    className: "QuarantinePolicy",
     modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ImportPipeline"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
+      status: {
+        serializedName: "status",
         type: {
           name: "String"
         }
@@ -740,27 +770,20 @@ export const ImportPipelineListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const ImportPipelineSourceProperties: coreClient.CompositeMapper = {
+export const TrustPolicy: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImportPipelineSourceProperties",
+    className: "TrustPolicy",
     modelProperties: {
       type: {
-        defaultValue: "AzureStorageBlobContainer",
+        defaultValue: "Notary",
         serializedName: "type",
         type: {
           name: "String"
         }
       },
-      uri: {
-        serializedName: "uri",
-        type: {
-          name: "String"
-        }
-      },
-      keyVaultUri: {
-        serializedName: "keyVaultUri",
-        required: true,
+      status: {
+        serializedName: "status",
         type: {
           name: "String"
         }
@@ -769,30 +792,43 @@ export const ImportPipelineSourceProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const PipelineTriggerProperties: coreClient.CompositeMapper = {
+export const RetentionPolicy: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineTriggerProperties",
+    className: "RetentionPolicy",
     modelProperties: {
-      sourceTrigger: {
-        serializedName: "sourceTrigger",
+      days: {
+        defaultValue: 7,
+        serializedName: "days",
         type: {
-          name: "Composite",
-          className: "PipelineSourceTriggerProperties"
+          name: "Number"
+        }
+      },
+      lastUpdatedTime: {
+        serializedName: "lastUpdatedTime",
+        readOnly: true,
+        type: {
+          name: "DateTime"
+        }
+      },
+      status: {
+        serializedName: "status",
+        type: {
+          name: "String"
         }
       }
     }
   }
 };
 
-export const PipelineSourceTriggerProperties: coreClient.CompositeMapper = {
+export const ExportPolicy: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineSourceTriggerProperties",
+    className: "ExportPolicy",
     modelProperties: {
       status: {
+        defaultValue: "enabled",
         serializedName: "status",
-        required: true,
         type: {
           name: "String"
         }
@@ -801,204 +837,188 @@ export const PipelineSourceTriggerProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const OperationListResult: coreClient.CompositeMapper = {
+export const EncryptionProperty: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "OperationListResult",
+    className: "EncryptionProperty",
     modelProperties: {
-      value: {
-        serializedName: "value",
+      status: {
+        serializedName: "status",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "OperationDefinition"
-            }
-          }
+          name: "String"
         }
       },
-      nextLink: {
-        serializedName: "nextLink",
+      keyVaultProperties: {
+        serializedName: "keyVaultProperties",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "KeyVaultProperties"
         }
       }
     }
   }
 };
 
-export const OperationDefinition: coreClient.CompositeMapper = {
+export const KeyVaultProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "OperationDefinition",
+    className: "KeyVaultProperties",
     modelProperties: {
-      origin: {
-        serializedName: "origin",
+      keyIdentifier: {
+        serializedName: "keyIdentifier",
         type: {
           name: "String"
         }
       },
-      name: {
-        serializedName: "name",
+      versionedKeyIdentifier: {
+        serializedName: "versionedKeyIdentifier",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      display: {
-        serializedName: "display",
+      identity: {
+        serializedName: "identity",
         type: {
-          name: "Composite",
-          className: "OperationDisplayDefinition"
+          name: "String"
         }
       },
-      isDataAction: {
-        serializedName: "isDataAction",
+      keyRotationEnabled: {
+        serializedName: "keyRotationEnabled",
+        readOnly: true,
         type: {
           name: "Boolean"
         }
       },
-      serviceSpecification: {
-        serializedName: "properties.serviceSpecification",
+      lastKeyRotationTimestamp: {
+        serializedName: "lastKeyRotationTimestamp",
+        readOnly: true,
         type: {
-          name: "Composite",
-          className: "OperationServiceSpecificationDefinition"
+          name: "DateTime"
         }
       }
     }
   }
 };
 
-export const OperationDisplayDefinition: coreClient.CompositeMapper = {
+export const Resource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "OperationDisplayDefinition",
+    className: "Resource",
     modelProperties: {
-      provider: {
-        serializedName: "provider",
+      id: {
+        serializedName: "id",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      resource: {
-        serializedName: "resource",
+      name: {
+        serializedName: "name",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      operation: {
-        serializedName: "operation",
+      type: {
+        serializedName: "type",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "description",
+      location: {
+        serializedName: "location",
+        required: true,
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const OperationServiceSpecificationDefinition: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "OperationServiceSpecificationDefinition",
-    modelProperties: {
-      metricSpecifications: {
-        serializedName: "metricSpecifications",
+      },
+      tags: {
+        serializedName: "tags",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "OperationMetricSpecificationDefinition"
-            }
-          }
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      logSpecifications: {
-        serializedName: "logSpecifications",
+      systemData: {
+        serializedName: "systemData",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "OperationLogSpecificationDefinition"
-            }
-          }
+          name: "Composite",
+          className: "SystemData"
         }
       }
     }
   }
 };
 
-export const OperationMetricSpecificationDefinition: coreClient.CompositeMapper = {
+export const RegistryUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "OperationMetricSpecificationDefinition",
+    className: "RegistryUpdateParameters",
     modelProperties: {
-      name: {
-        serializedName: "name",
+      identity: {
+        serializedName: "identity",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "IdentityProperties"
         }
       },
-      displayName: {
-        serializedName: "displayName",
+      tags: {
+        serializedName: "tags",
         type: {
-          name: "String"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      displayDescription: {
-        serializedName: "displayDescription",
+      sku: {
+        serializedName: "sku",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "Sku"
         }
       },
-      unit: {
-        serializedName: "unit",
+      adminUserEnabled: {
+        serializedName: "properties.adminUserEnabled",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       },
-      aggregationType: {
-        serializedName: "aggregationType",
+      networkRuleSet: {
+        serializedName: "properties.networkRuleSet",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "NetworkRuleSet"
         }
       },
-      internalMetricName: {
-        serializedName: "internalMetricName",
+      policies: {
+        serializedName: "properties.policies",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "Policies"
         }
-      }
-    }
-  }
-};
-
-export const OperationLogSpecificationDefinition: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "OperationLogSpecificationDefinition",
-    modelProperties: {
-      name: {
-        serializedName: "name",
+      },
+      encryption: {
+        serializedName: "properties.encryption",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "EncryptionProperty"
         }
       },
-      displayName: {
-        serializedName: "displayName",
+      dataEndpointEnabled: {
+        serializedName: "properties.dataEndpointEnabled",
+        type: {
+          name: "Boolean"
+        }
+      },
+      publicNetworkAccess: {
+        serializedName: "properties.publicNetworkAccess",
         type: {
           name: "String"
         }
       },
-      blobDuration: {
-        serializedName: "blobDuration",
+      networkRuleBypassOptions: {
+        serializedName: "properties.networkRuleBypassOptions",
         type: {
           name: "String"
         }
@@ -1007,54 +1027,52 @@ export const OperationLogSpecificationDefinition: coreClient.CompositeMapper = {
   }
 };
 
-export const RegistryNameCheckRequest: coreClient.CompositeMapper = {
+export const RegistryUsageListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "RegistryNameCheckRequest",
+    className: "RegistryUsageListResult",
     modelProperties: {
-      name: {
-        constraints: {
-          Pattern: new RegExp("^[a-zA-Z0-9]*$"),
-          MaxLength: 50,
-          MinLength: 5
-        },
-        serializedName: "name",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      type: {
-        defaultValue: "Microsoft.ContainerRegistry/registries",
-        isConstant: true,
-        serializedName: "type",
+      value: {
+        serializedName: "value",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "RegistryUsage"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const RegistryNameStatus: coreClient.CompositeMapper = {
+export const RegistryUsage: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "RegistryNameStatus",
+    className: "RegistryUsage",
     modelProperties: {
-      nameAvailable: {
-        serializedName: "nameAvailable",
+      name: {
+        serializedName: "name",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      reason: {
-        serializedName: "reason",
+      limit: {
+        serializedName: "limit",
         type: {
-          name: "String"
+          name: "Number"
         }
       },
-      message: {
-        serializedName: "message",
+      currentValue: {
+        serializedName: "currentValue",
+        type: {
+          name: "Number"
+        }
+      },
+      unit: {
+        serializedName: "unit",
         type: {
           name: "String"
         }
@@ -1063,10 +1081,10 @@ export const RegistryNameStatus: coreClient.CompositeMapper = {
   }
 };
 
-export const PipelineRunListResult: coreClient.CompositeMapper = {
+export const PrivateLinkResourceListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineRunListResult",
+    className: "PrivateLinkResourceListResult",
     modelProperties: {
       value: {
         serializedName: "value",
@@ -1075,7 +1093,7 @@ export const PipelineRunListResult: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "PipelineRun"
+              className: "PrivateLinkResource"
             }
           }
         }
@@ -1090,166 +1108,140 @@ export const PipelineRunListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const PipelineRunRequest: coreClient.CompositeMapper = {
+export const PrivateLinkResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineRunRequest",
+    className: "PrivateLinkResource",
     modelProperties: {
-      pipelineResourceId: {
-        serializedName: "pipelineResourceId",
+      type: {
+        serializedName: "type",
+        readOnly: true,
         type: {
           name: "String"
         }
       },
-      artifacts: {
-        serializedName: "artifacts",
+      id: {
+        serializedName: "id",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      source: {
-        serializedName: "source",
+      name: {
+        serializedName: "name",
         type: {
-          name: "Composite",
-          className: "PipelineRunSourceProperties"
+          name: "String"
         }
       },
-      target: {
-        serializedName: "target",
+      groupId: {
+        serializedName: "properties.groupId",
         type: {
-          name: "Composite",
-          className: "PipelineRunTargetProperties"
+          name: "String"
         }
       },
-      catalogDigest: {
-        serializedName: "catalogDigest",
+      requiredMembers: {
+        serializedName: "properties.requiredMembers",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      requiredZoneNames: {
+        serializedName: "properties.requiredZoneNames",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const PipelineRunSourceProperties: coreClient.CompositeMapper = {
+export const ErrorResponse: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineRunSourceProperties",
+    className: "ErrorResponse",
     modelProperties: {
-      type: {
-        defaultValue: "AzureStorageBlob",
-        serializedName: "type",
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        serializedName: "name",
+      error: {
+        serializedName: "error",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ErrorResponseBody"
         }
       }
     }
   }
 };
 
-export const PipelineRunTargetProperties: coreClient.CompositeMapper = {
+export const ErrorResponseBody: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineRunTargetProperties",
+    className: "ErrorResponseBody",
     modelProperties: {
-      type: {
-        defaultValue: "AzureStorageBlob",
-        serializedName: "type",
+      code: {
+        serializedName: "code",
+        required: true,
         type: {
           name: "String"
         }
       },
-      name: {
-        serializedName: "name",
+      message: {
+        serializedName: "message",
+        required: true,
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const PipelineRunResponse: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "PipelineRunResponse",
-    modelProperties: {
-      status: {
-        serializedName: "status",
+      },
+      target: {
+        serializedName: "target",
         type: {
           name: "String"
         }
       },
-      importedArtifacts: {
-        serializedName: "importedArtifacts",
+      details: {
+        serializedName: "details",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "String"
+              name: "Composite",
+              className: "InnerErrorDescription"
             }
           }
         }
-      },
-      progress: {
-        serializedName: "progress",
-        type: {
-          name: "Composite",
-          className: "ProgressProperties"
-        }
-      },
-      startTime: {
-        serializedName: "startTime",
-        type: {
-          name: "DateTime"
-        }
-      },
-      finishTime: {
-        serializedName: "finishTime",
+      }
+    }
+  }
+};
+
+export const InnerErrorDescription: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "InnerErrorDescription",
+    modelProperties: {
+      code: {
+        serializedName: "code",
+        required: true,
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      source: {
-        serializedName: "source",
+      message: {
+        serializedName: "message",
+        required: true,
         type: {
-          name: "Composite",
-          className: "ImportPipelineSourceProperties"
+          name: "String"
         }
       },
       target: {
         serializedName: "target",
-        type: {
-          name: "Composite",
-          className: "ExportPipelineTargetProperties"
-        }
-      },
-      catalogDigest: {
-        serializedName: "catalogDigest",
-        type: {
-          name: "String"
-        }
-      },
-      trigger: {
-        serializedName: "trigger",
-        type: {
-          name: "Composite",
-          className: "PipelineTriggerDescriptor"
-        }
-      },
-      pipelineRunErrorMessage: {
-        serializedName: "pipelineRunErrorMessage",
         type: {
           name: "String"
         }
@@ -1258,56 +1250,76 @@ export const PipelineRunResponse: coreClient.CompositeMapper = {
   }
 };
 
-export const ProgressProperties: coreClient.CompositeMapper = {
+export const RegistryListCredentialsResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ProgressProperties",
+    className: "RegistryListCredentialsResult",
     modelProperties: {
-      percentage: {
-        serializedName: "percentage",
+      username: {
+        serializedName: "username",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const PipelineTriggerDescriptor: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "PipelineTriggerDescriptor",
-    modelProperties: {
-      sourceTrigger: {
-        serializedName: "sourceTrigger",
-        type: {
-          name: "Composite",
-          className: "PipelineSourceTriggerDescriptor"
+      },
+      passwords: {
+        serializedName: "passwords",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "RegistryPassword"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const PipelineSourceTriggerDescriptor: coreClient.CompositeMapper = {
+export const RegistryPassword: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineSourceTriggerDescriptor",
+    className: "RegistryPassword",
     modelProperties: {
-      timestamp: {
-        serializedName: "timestamp",
+      name: {
+        serializedName: "name",
         type: {
-          name: "DateTime"
+          name: "Enum",
+          allowedValues: ["password", "password2"]
+        }
+      },
+      value: {
+        serializedName: "value",
+        type: {
+          name: "String"
         }
       }
     }
   }
 };
 
-export const PrivateEndpointConnectionListResult: coreClient.CompositeMapper = {
+export const RegenerateCredentialParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PrivateEndpointConnectionListResult",
+    className: "RegenerateCredentialParameters",
+    modelProperties: {
+      name: {
+        serializedName: "name",
+        required: true,
+        type: {
+          name: "Enum",
+          allowedValues: ["password", "password2"]
+        }
+      }
+    }
+  }
+};
+
+export const ReplicationListResult: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "ReplicationListResult",
     modelProperties: {
       value: {
         serializedName: "value",
@@ -1316,7 +1328,7 @@ export const PrivateEndpointConnectionListResult: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "PrivateEndpointConnection"
+              className: "Replication"
             }
           }
         }
@@ -1331,52 +1343,32 @@ export const PrivateEndpointConnectionListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const PrivateEndpoint: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "PrivateEndpoint",
-    modelProperties: {
-      id: {
-        serializedName: "id",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const PrivateLinkServiceConnectionState: coreClient.CompositeMapper = {
+export const ReplicationUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PrivateLinkServiceConnectionState",
+    className: "ReplicationUpdateParameters",
     modelProperties: {
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      },
-      description: {
-        serializedName: "description",
+      tags: {
+        serializedName: "tags",
         type: {
-          name: "String"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      actionsRequired: {
-        serializedName: "actionsRequired",
+      regionEndpointEnabled: {
+        serializedName: "properties.regionEndpointEnabled",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const RegistryListResult: coreClient.CompositeMapper = {
+export const WebhookListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "RegistryListResult",
+    className: "WebhookListResult",
     modelProperties: {
       value: {
         serializedName: "value",
@@ -1385,7 +1377,7 @@ export const RegistryListResult: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "Registry"
+              className: "Webhook"
             }
           }
         }
@@ -1400,143 +1392,109 @@ export const RegistryListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const Resource: coreClient.CompositeMapper = {
+export const WebhookCreateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Resource",
+    className: "WebhookCreateParameters",
     modelProperties: {
-      id: {
-        serializedName: "id",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        serializedName: "name",
-        readOnly: true,
+      tags: {
+        serializedName: "tags",
         type: {
-          name: "String"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      type: {
-        serializedName: "type",
-        readOnly: true,
+      location: {
+        serializedName: "location",
+        required: true,
         type: {
           name: "String"
         }
       },
-      location: {
-        serializedName: "location",
-        required: true,
+      serviceUri: {
+        serializedName: "properties.serviceUri",
         type: {
           name: "String"
         }
       },
-      tags: {
-        serializedName: "tags",
+      customHeaders: {
+        serializedName: "properties.customHeaders",
         type: {
           name: "Dictionary",
           value: { type: { name: "String" } }
         }
       },
-      systemData: {
-        serializedName: "systemData",
+      status: {
+        serializedName: "properties.status",
         type: {
-          name: "Composite",
-          className: "SystemData"
+          name: "String"
         }
-      }
-    }
-  }
-};
-
-export const Sku: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "Sku",
-    modelProperties: {
-      name: {
-        serializedName: "name",
-        required: true,
+      },
+      scope: {
+        serializedName: "properties.scope",
         type: {
           name: "String"
         }
       },
-      tier: {
-        serializedName: "tier",
-        readOnly: true,
+      actions: {
+        serializedName: "properties.actions",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const Status: coreClient.CompositeMapper = {
+export const WebhookUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Status",
+    className: "WebhookUpdateParameters",
     modelProperties: {
-      displayStatus: {
-        serializedName: "displayStatus",
-        readOnly: true,
+      tags: {
+        serializedName: "tags",
         type: {
-          name: "String"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      message: {
-        serializedName: "message",
-        readOnly: true,
+      serviceUri: {
+        serializedName: "properties.serviceUri",
         type: {
           name: "String"
         }
       },
-      timestamp: {
-        serializedName: "timestamp",
-        readOnly: true,
+      customHeaders: {
+        serializedName: "properties.customHeaders",
         type: {
-          name: "DateTime"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
-      }
-    }
-  }
-};
-
-export const NetworkRuleSet: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "NetworkRuleSet",
-    modelProperties: {
-      defaultAction: {
-        defaultValue: "Allow",
-        serializedName: "defaultAction",
-        required: true,
+      },
+      status: {
+        serializedName: "properties.status",
         type: {
           name: "String"
         }
       },
-      virtualNetworkRules: {
-        serializedName: "virtualNetworkRules",
+      scope: {
+        serializedName: "properties.scope",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "VirtualNetworkRule"
-            }
-          }
+          name: "String"
         }
       },
-      ipRules: {
-        serializedName: "ipRules",
+      actions: {
+        serializedName: "properties.actions",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "Composite",
-              className: "IPRule"
+              name: "String"
             }
           }
         }
@@ -1545,20 +1503,13 @@ export const NetworkRuleSet: coreClient.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkRule: coreClient.CompositeMapper = {
+export const EventInfo: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "VirtualNetworkRule",
+    className: "EventInfo",
     modelProperties: {
-      action: {
-        serializedName: "action",
-        type: {
-          name: "String"
-        }
-      },
-      virtualNetworkResourceId: {
+      id: {
         serializedName: "id",
-        required: true,
         type: {
           name: "String"
         }
@@ -1567,20 +1518,25 @@ export const VirtualNetworkRule: coreClient.CompositeMapper = {
   }
 };
 
-export const IPRule: coreClient.CompositeMapper = {
+export const EventListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "IPRule",
+    className: "EventListResult",
     modelProperties: {
-      action: {
-        serializedName: "action",
+      value: {
+        serializedName: "value",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "Event"
+            }
+          }
         }
       },
-      iPAddressOrRange: {
-        serializedName: "value",
-        required: true,
+      nextLink: {
+        serializedName: "nextLink",
         type: {
           name: "String"
         }
@@ -1589,1357 +1545,39 @@ export const IPRule: coreClient.CompositeMapper = {
   }
 };
 
-export const Policies: coreClient.CompositeMapper = {
+export const EventRequestMessage: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Policies",
+    className: "EventRequestMessage",
     modelProperties: {
-      quarantinePolicy: {
-        serializedName: "quarantinePolicy",
-        type: {
-          name: "Composite",
-          className: "QuarantinePolicy"
-        }
-      },
-      trustPolicy: {
-        serializedName: "trustPolicy",
-        type: {
-          name: "Composite",
-          className: "TrustPolicy"
-        }
-      },
-      retentionPolicy: {
-        serializedName: "retentionPolicy",
-        type: {
-          name: "Composite",
-          className: "RetentionPolicy"
-        }
-      },
-      exportPolicy: {
-        serializedName: "exportPolicy",
-        type: {
-          name: "Composite",
-          className: "ExportPolicy"
-        }
-      }
-    }
-  }
-};
-
-export const QuarantinePolicy: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "QuarantinePolicy",
-    modelProperties: {
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const TrustPolicy: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TrustPolicy",
-    modelProperties: {
-      type: {
-        defaultValue: "Notary",
-        serializedName: "type",
-        type: {
-          name: "String"
-        }
-      },
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const RetentionPolicy: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RetentionPolicy",
-    modelProperties: {
-      days: {
-        defaultValue: 7,
-        serializedName: "days",
-        type: {
-          name: "Number"
-        }
-      },
-      lastUpdatedTime: {
-        serializedName: "lastUpdatedTime",
-        readOnly: true,
-        type: {
-          name: "DateTime"
-        }
-      },
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const ExportPolicy: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ExportPolicy",
-    modelProperties: {
-      status: {
-        defaultValue: "enabled",
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const EncryptionProperty: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "EncryptionProperty",
-    modelProperties: {
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      },
-      keyVaultProperties: {
-        serializedName: "keyVaultProperties",
-        type: {
-          name: "Composite",
-          className: "KeyVaultProperties"
-        }
-      }
-    }
-  }
-};
-
-export const KeyVaultProperties: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "KeyVaultProperties",
-    modelProperties: {
-      keyIdentifier: {
-        serializedName: "keyIdentifier",
-        type: {
-          name: "String"
-        }
-      },
-      versionedKeyIdentifier: {
-        serializedName: "versionedKeyIdentifier",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      identity: {
-        serializedName: "identity",
-        type: {
-          name: "String"
-        }
-      },
-      keyRotationEnabled: {
-        serializedName: "keyRotationEnabled",
-        readOnly: true,
-        type: {
-          name: "Boolean"
-        }
-      },
-      lastKeyRotationTimestamp: {
-        serializedName: "lastKeyRotationTimestamp",
-        readOnly: true,
-        type: {
-          name: "DateTime"
-        }
-      }
-    }
-  }
-};
-
-export const RegistryUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RegistryUpdateParameters",
-    modelProperties: {
-      identity: {
-        serializedName: "identity",
-        type: {
-          name: "Composite",
-          className: "IdentityProperties"
-        }
-      },
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      sku: {
-        serializedName: "sku",
-        type: {
-          name: "Composite",
-          className: "Sku"
-        }
-      },
-      adminUserEnabled: {
-        serializedName: "properties.adminUserEnabled",
-        type: {
-          name: "Boolean"
-        }
-      },
-      networkRuleSet: {
-        serializedName: "properties.networkRuleSet",
-        type: {
-          name: "Composite",
-          className: "NetworkRuleSet"
-        }
-      },
-      policies: {
-        serializedName: "properties.policies",
-        type: {
-          name: "Composite",
-          className: "Policies"
-        }
-      },
-      encryption: {
-        serializedName: "properties.encryption",
-        type: {
-          name: "Composite",
-          className: "EncryptionProperty"
-        }
-      },
-      dataEndpointEnabled: {
-        serializedName: "properties.dataEndpointEnabled",
-        type: {
-          name: "Boolean"
-        }
-      },
-      publicNetworkAccess: {
-        serializedName: "properties.publicNetworkAccess",
-        type: {
-          name: "String"
-        }
-      },
-      networkRuleBypassOptions: {
-        serializedName: "properties.networkRuleBypassOptions",
-        type: {
-          name: "String"
-        }
-      },
-      anonymousPullEnabled: {
-        serializedName: "properties.anonymousPullEnabled",
-        type: {
-          name: "Boolean"
-        }
-      }
-    }
-  }
-};
-
-export const RegistryUsageListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RegistryUsageListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "RegistryUsage"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const RegistryUsage: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RegistryUsage",
-    modelProperties: {
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      limit: {
-        serializedName: "limit",
-        type: {
-          name: "Number"
-        }
-      },
-      currentValue: {
-        serializedName: "currentValue",
-        type: {
-          name: "Number"
-        }
-      },
-      unit: {
-        serializedName: "unit",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const PrivateLinkResourceListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "PrivateLinkResourceListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "PrivateLinkResource"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const PrivateLinkResource: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "PrivateLinkResource",
-    modelProperties: {
-      type: {
-        serializedName: "type",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      id: {
-        serializedName: "id",
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      groupId: {
-        serializedName: "properties.groupId",
-        type: {
-          name: "String"
-        }
-      },
-      requiredMembers: {
-        serializedName: "properties.requiredMembers",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      requiredZoneNames: {
-        serializedName: "properties.requiredZoneNames",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const RegistryListCredentialsResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RegistryListCredentialsResult",
-    modelProperties: {
-      username: {
-        serializedName: "username",
-        type: {
-          name: "String"
-        }
-      },
-      passwords: {
-        serializedName: "passwords",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "RegistryPassword"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const RegistryPassword: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RegistryPassword",
-    modelProperties: {
-      name: {
-        serializedName: "name",
-        type: {
-          name: "Enum",
-          allowedValues: ["password", "password2"]
-        }
-      },
-      value: {
-        serializedName: "value",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const RegenerateCredentialParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RegenerateCredentialParameters",
-    modelProperties: {
-      name: {
-        serializedName: "name",
-        required: true,
-        type: {
-          name: "Enum",
-          allowedValues: ["password", "password2"]
-        }
-      }
-    }
-  }
-};
-
-export const ReplicationListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ReplicationListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Replication"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const ReplicationUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ReplicationUpdateParameters",
-    modelProperties: {
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      regionEndpointEnabled: {
-        serializedName: "properties.regionEndpointEnabled",
-        type: {
-          name: "Boolean"
-        }
-      }
-    }
-  }
-};
-
-export const ScopeMapListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ScopeMapListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ScopeMap"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const ScopeMapUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ScopeMapUpdateParameters",
-    modelProperties: {
-      description: {
-        serializedName: "properties.description",
-        type: {
-          name: "String"
-        }
-      },
-      actions: {
-        serializedName: "properties.actions",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const TokenListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TokenListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Token"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const TokenCredentialsProperties: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TokenCredentialsProperties",
-    modelProperties: {
-      certificates: {
-        serializedName: "certificates",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "TokenCertificate"
-            }
-          }
-        }
-      },
-      passwords: {
-        serializedName: "passwords",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "TokenPassword"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const TokenCertificate: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TokenCertificate",
-    modelProperties: {
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      expiry: {
-        serializedName: "expiry",
-        type: {
-          name: "DateTime"
-        }
-      },
-      thumbprint: {
-        serializedName: "thumbprint",
-        type: {
-          name: "String"
-        }
-      },
-      encodedPemCertificate: {
-        serializedName: "encodedPemCertificate",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const TokenPassword: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TokenPassword",
-    modelProperties: {
-      creationTime: {
-        serializedName: "creationTime",
-        type: {
-          name: "DateTime"
-        }
-      },
-      expiry: {
-        serializedName: "expiry",
-        type: {
-          name: "DateTime"
-        }
-      },
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      value: {
-        serializedName: "value",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const TokenUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TokenUpdateParameters",
-    modelProperties: {
-      scopeMapId: {
-        serializedName: "properties.scopeMapId",
-        type: {
-          name: "String"
-        }
-      },
-      status: {
-        serializedName: "properties.status",
-        type: {
-          name: "String"
-        }
-      },
-      credentials: {
-        serializedName: "properties.credentials",
-        type: {
-          name: "Composite",
-          className: "TokenCredentialsProperties"
-        }
-      }
-    }
-  }
-};
-
-export const GenerateCredentialsParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "GenerateCredentialsParameters",
-    modelProperties: {
-      tokenId: {
-        serializedName: "tokenId",
-        type: {
-          name: "String"
-        }
-      },
-      expiry: {
-        serializedName: "expiry",
-        type: {
-          name: "DateTime"
-        }
-      },
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const GenerateCredentialsResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "GenerateCredentialsResult",
-    modelProperties: {
-      username: {
-        serializedName: "username",
-        type: {
-          name: "String"
-        }
-      },
-      passwords: {
-        serializedName: "passwords",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "TokenPassword"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const WebhookListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "WebhookListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Webhook"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const WebhookCreateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "WebhookCreateParameters",
-    modelProperties: {
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      location: {
-        serializedName: "location",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      serviceUri: {
-        serializedName: "properties.serviceUri",
-        type: {
-          name: "String"
-        }
-      },
-      customHeaders: {
-        serializedName: "properties.customHeaders",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      status: {
-        serializedName: "properties.status",
-        type: {
-          name: "String"
-        }
-      },
-      scope: {
-        serializedName: "properties.scope",
-        type: {
-          name: "String"
-        }
-      },
-      actions: {
-        serializedName: "properties.actions",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const WebhookUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "WebhookUpdateParameters",
-    modelProperties: {
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      serviceUri: {
-        serializedName: "properties.serviceUri",
-        type: {
-          name: "String"
-        }
-      },
-      customHeaders: {
-        serializedName: "properties.customHeaders",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      status: {
-        serializedName: "properties.status",
-        type: {
-          name: "String"
-        }
-      },
-      scope: {
-        serializedName: "properties.scope",
-        type: {
-          name: "String"
-        }
-      },
-      actions: {
-        serializedName: "properties.actions",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const EventInfo: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "EventInfo",
-    modelProperties: {
-      id: {
-        serializedName: "id",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const EventListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "EventListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Event"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const EventRequestMessage: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "EventRequestMessage",
-    modelProperties: {
-      content: {
-        serializedName: "content",
-        type: {
-          name: "Composite",
-          className: "EventContent"
-        }
-      },
-      headers: {
-        serializedName: "headers",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      method: {
-        serializedName: "method",
-        type: {
-          name: "String"
-        }
-      },
-      requestUri: {
-        serializedName: "requestUri",
-        type: {
-          name: "String"
-        }
-      },
-      version: {
-        serializedName: "version",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const EventContent: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "EventContent",
-    modelProperties: {
-      id: {
-        serializedName: "id",
-        type: {
-          name: "String"
-        }
-      },
-      timestamp: {
-        serializedName: "timestamp",
-        type: {
-          name: "DateTime"
-        }
-      },
-      action: {
-        serializedName: "action",
-        type: {
-          name: "String"
-        }
-      },
-      target: {
-        serializedName: "target",
-        type: {
-          name: "Composite",
-          className: "Target"
-        }
-      },
-      request: {
-        serializedName: "request",
-        type: {
-          name: "Composite",
-          className: "Request"
-        }
-      },
-      actor: {
-        serializedName: "actor",
-        type: {
-          name: "Composite",
-          className: "Actor"
-        }
-      },
-      source: {
-        serializedName: "source",
-        type: {
-          name: "Composite",
-          className: "Source"
-        }
-      }
-    }
-  }
-};
-
-export const Target: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "Target",
-    modelProperties: {
-      mediaType: {
-        serializedName: "mediaType",
-        type: {
-          name: "String"
-        }
-      },
-      size: {
-        serializedName: "size",
-        type: {
-          name: "Number"
-        }
-      },
-      digest: {
-        serializedName: "digest",
-        type: {
-          name: "String"
-        }
-      },
-      length: {
-        serializedName: "length",
-        type: {
-          name: "Number"
-        }
-      },
-      repository: {
-        serializedName: "repository",
-        type: {
-          name: "String"
-        }
-      },
-      url: {
-        serializedName: "url",
-        type: {
-          name: "String"
-        }
-      },
-      tag: {
-        serializedName: "tag",
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      version: {
-        serializedName: "version",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const Request: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "Request",
-    modelProperties: {
-      id: {
-        serializedName: "id",
-        type: {
-          name: "String"
-        }
-      },
-      addr: {
-        serializedName: "addr",
-        type: {
-          name: "String"
-        }
-      },
-      host: {
-        serializedName: "host",
-        type: {
-          name: "String"
-        }
-      },
-      method: {
-        serializedName: "method",
-        type: {
-          name: "String"
-        }
-      },
-      useragent: {
-        serializedName: "useragent",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const Actor: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "Actor",
-    modelProperties: {
-      name: {
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const Source: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "Source",
-    modelProperties: {
-      addr: {
-        serializedName: "addr",
-        type: {
-          name: "String"
-        }
-      },
-      instanceID: {
-        serializedName: "instanceID",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const EventResponseMessage: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "EventResponseMessage",
-    modelProperties: {
-      content: {
-        serializedName: "content",
-        type: {
-          name: "String"
-        }
-      },
-      headers: {
-        serializedName: "headers",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      reasonPhrase: {
-        serializedName: "reasonPhrase",
-        type: {
-          name: "String"
-        }
-      },
-      statusCode: {
-        serializedName: "statusCode",
-        type: {
-          name: "String"
-        }
-      },
-      version: {
-        serializedName: "version",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const CallbackConfig: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "CallbackConfig",
-    modelProperties: {
-      serviceUri: {
-        serializedName: "serviceUri",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      customHeaders: {
-        serializedName: "customHeaders",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      }
-    }
-  }
-};
-
-export const AgentPoolUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AgentPoolUpdateParameters",
-    modelProperties: {
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      count: {
-        serializedName: "properties.count",
-        type: {
-          name: "Number"
-        }
-      }
-    }
-  }
-};
-
-export const AgentPoolListResult: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AgentPoolListResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "AgentPool"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const AgentPoolQueueStatus: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AgentPoolQueueStatus",
-    modelProperties: {
-      count: {
-        serializedName: "count",
-        type: {
-          name: "Number"
-        }
-      }
-    }
-  }
-};
-
-export const RunRequest: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RunRequest",
-    uberParent: "RunRequest",
-    polymorphicDiscriminator: {
-      serializedName: "type",
-      clientName: "type"
-    },
-    modelProperties: {
-      type: {
-        serializedName: "type",
-        required: true,
+      content: {
+        serializedName: "content",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "EventContent"
         }
       },
-      isArchiveEnabled: {
-        defaultValue: false,
-        serializedName: "isArchiveEnabled",
+      headers: {
+        serializedName: "headers",
         type: {
-          name: "Boolean"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      agentPoolName: {
-        serializedName: "agentPoolName",
+      method: {
+        serializedName: "method",
         type: {
           name: "String"
         }
       },
-      logTemplate: {
-        serializedName: "logTemplate",
+      requestUri: {
+        serializedName: "requestUri",
+        type: {
+          name: "String"
+        }
+      },
+      version: {
+        serializedName: "version",
         type: {
           name: "String"
         }
@@ -2948,115 +1586,116 @@ export const RunRequest: coreClient.CompositeMapper = {
   }
 };
 
-export const ImageDescriptor: coreClient.CompositeMapper = {
+export const EventContent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImageDescriptor",
+    className: "EventContent",
     modelProperties: {
-      registry: {
-        serializedName: "registry",
+      id: {
+        serializedName: "id",
         type: {
           name: "String"
         }
       },
-      repository: {
-        serializedName: "repository",
+      timestamp: {
+        serializedName: "timestamp",
         type: {
-          name: "String"
+          name: "DateTime"
         }
       },
-      tag: {
-        serializedName: "tag",
+      action: {
+        serializedName: "action",
         type: {
           name: "String"
         }
       },
-      digest: {
-        serializedName: "digest",
+      target: {
+        serializedName: "target",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "Target"
         }
-      }
-    }
-  }
-};
-
-export const ImageUpdateTrigger: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ImageUpdateTrigger",
-    modelProperties: {
-      id: {
-        serializedName: "id",
+      },
+      request: {
+        serializedName: "request",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "Request"
         }
       },
-      timestamp: {
-        serializedName: "timestamp",
+      actor: {
+        serializedName: "actor",
         type: {
-          name: "DateTime"
+          name: "Composite",
+          className: "Actor"
         }
       },
-      images: {
-        serializedName: "images",
+      source: {
+        serializedName: "source",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ImageDescriptor"
-            }
-          }
+          name: "Composite",
+          className: "Source"
         }
       }
     }
   }
 };
 
-export const SourceTriggerDescriptor: coreClient.CompositeMapper = {
+export const Target: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SourceTriggerDescriptor",
+    className: "Target",
     modelProperties: {
-      id: {
-        serializedName: "id",
+      mediaType: {
+        serializedName: "mediaType",
         type: {
           name: "String"
         }
       },
-      eventType: {
-        serializedName: "eventType",
+      size: {
+        serializedName: "size",
+        type: {
+          name: "Number"
+        }
+      },
+      digest: {
+        serializedName: "digest",
         type: {
           name: "String"
         }
       },
-      commitId: {
-        serializedName: "commitId",
+      length: {
+        serializedName: "length",
+        type: {
+          name: "Number"
+        }
+      },
+      repository: {
+        serializedName: "repository",
         type: {
           name: "String"
         }
       },
-      pullRequestId: {
-        serializedName: "pullRequestId",
+      url: {
+        serializedName: "url",
         type: {
           name: "String"
         }
       },
-      repositoryUrl: {
-        serializedName: "repositoryUrl",
+      tag: {
+        serializedName: "tag",
         type: {
           name: "String"
         }
       },
-      branchName: {
-        serializedName: "branchName",
+      name: {
+        serializedName: "name",
         type: {
           name: "String"
         }
       },
-      providerType: {
-        serializedName: "providerType",
+      version: {
+        serializedName: "version",
         type: {
           name: "String"
         }
@@ -3065,47 +1704,37 @@ export const SourceTriggerDescriptor: coreClient.CompositeMapper = {
   }
 };
 
-export const TimerTriggerDescriptor: coreClient.CompositeMapper = {
+export const Request: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TimerTriggerDescriptor",
+    className: "Request",
     modelProperties: {
-      timerTriggerName: {
-        serializedName: "timerTriggerName",
+      id: {
+        serializedName: "id",
         type: {
           name: "String"
         }
       },
-      scheduleOccurrence: {
-        serializedName: "scheduleOccurrence",
+      addr: {
+        serializedName: "addr",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const PlatformProperties: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "PlatformProperties",
-    modelProperties: {
-      os: {
-        serializedName: "os",
-        required: true,
+      },
+      host: {
+        serializedName: "host",
         type: {
           name: "String"
         }
       },
-      architecture: {
-        serializedName: "architecture",
+      method: {
+        serializedName: "method",
         type: {
           name: "String"
         }
       },
-      variant: {
-        serializedName: "variant",
+      useragent: {
+        serializedName: "useragent",
         type: {
           name: "String"
         }
@@ -3114,34 +1743,34 @@ export const PlatformProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const AgentProperties: coreClient.CompositeMapper = {
+export const Actor: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "AgentProperties",
+    className: "Actor",
     modelProperties: {
-      cpu: {
-        serializedName: "cpu",
+      name: {
+        serializedName: "name",
         type: {
-          name: "Number"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const SourceUploadDefinition: coreClient.CompositeMapper = {
+export const Source: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SourceUploadDefinition",
+    className: "Source",
     modelProperties: {
-      uploadUrl: {
-        serializedName: "uploadUrl",
+      addr: {
+        serializedName: "addr",
         type: {
           name: "String"
         }
       },
-      relativePath: {
-        serializedName: "relativePath",
+      instanceID: {
+        serializedName: "instanceID",
         type: {
           name: "String"
         }
@@ -3150,87 +1779,74 @@ export const SourceUploadDefinition: coreClient.CompositeMapper = {
   }
 };
 
-export const RunListResult: coreClient.CompositeMapper = {
+export const EventResponseMessage: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "RunListResult",
+    className: "EventResponseMessage",
     modelProperties: {
-      value: {
-        serializedName: "value",
+      content: {
+        serializedName: "content",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Run"
-            }
-          }
+          name: "String"
         }
       },
-      nextLink: {
-        serializedName: "nextLink",
+      headers: {
+        serializedName: "headers",
+        type: {
+          name: "Dictionary",
+          value: { type: { name: "String" } }
+        }
+      },
+      reasonPhrase: {
+        serializedName: "reasonPhrase",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const RunUpdateParameters: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "RunUpdateParameters",
-    modelProperties: {
-      isArchiveEnabled: {
-        serializedName: "isArchiveEnabled",
+      },
+      statusCode: {
+        serializedName: "statusCode",
         type: {
-          name: "Boolean"
+          name: "String"
+        }
+      },
+      version: {
+        serializedName: "version",
+        type: {
+          name: "String"
         }
       }
     }
   }
 };
 
-export const RunGetLogResult: coreClient.CompositeMapper = {
+export const CallbackConfig: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "RunGetLogResult",
+    className: "CallbackConfig",
     modelProperties: {
-      logLink: {
-        serializedName: "logLink",
+      serviceUri: {
+        serializedName: "serviceUri",
+        required: true,
         type: {
           name: "String"
         }
       },
-      logArtifactLink: {
-        serializedName: "logArtifactLink",
+      customHeaders: {
+        serializedName: "customHeaders",
         type: {
-          name: "String"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       }
     }
   }
 };
 
-export const TaskRunUpdateParameters: coreClient.CompositeMapper = {
+export const AgentPoolUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TaskRunUpdateParameters",
+    className: "AgentPoolUpdateParameters",
     modelProperties: {
-      identity: {
-        serializedName: "identity",
-        type: {
-          name: "Composite",
-          className: "IdentityProperties"
-        }
-      },
-      location: {
-        serializedName: "location",
-        type: {
-          name: "String"
-        }
-      },
       tags: {
         serializedName: "tags",
         type: {
@@ -3238,27 +1854,20 @@ export const TaskRunUpdateParameters: coreClient.CompositeMapper = {
           value: { type: { name: "String" } }
         }
       },
-      runRequest: {
-        serializedName: "properties.runRequest",
-        type: {
-          name: "Composite",
-          className: "RunRequest"
-        }
-      },
-      forceUpdateTag: {
-        serializedName: "properties.forceUpdateTag",
+      count: {
+        serializedName: "properties.count",
         type: {
-          name: "String"
+          name: "Number"
         }
       }
     }
   }
 };
 
-export const TaskRunListResult: coreClient.CompositeMapper = {
+export const AgentPoolListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TaskRunListResult",
+    className: "AgentPoolListResult",
     modelProperties: {
       value: {
         serializedName: "value",
@@ -3267,7 +1876,7 @@ export const TaskRunListResult: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "TaskRun"
+              className: "AgentPool"
             }
           }
         }
@@ -3282,38 +1891,26 @@ export const TaskRunListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const TaskListResult: coreClient.CompositeMapper = {
+export const AgentPoolQueueStatus: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TaskListResult",
+    className: "AgentPoolQueueStatus",
     modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Task"
-            }
-          }
-        }
-      },
-      nextLink: {
-        serializedName: "nextLink",
+      count: {
+        serializedName: "count",
         type: {
-          name: "String"
+          name: "Number"
         }
       }
     }
   }
 };
 
-export const TaskStepProperties: coreClient.CompositeMapper = {
+export const RunRequest: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TaskStepProperties",
-    uberParent: "TaskStepProperties",
+    className: "RunRequest",
+    uberParent: "RunRequest",
     polymorphicDiscriminator: {
       serializedName: "type",
       clientName: "type"
@@ -3326,27 +1923,21 @@ export const TaskStepProperties: coreClient.CompositeMapper = {
           name: "String"
         }
       },
-      baseImageDependencies: {
-        serializedName: "baseImageDependencies",
-        readOnly: true,
+      isArchiveEnabled: {
+        defaultValue: false,
+        serializedName: "isArchiveEnabled",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "BaseImageDependency"
-            }
-          }
+          name: "Boolean"
         }
       },
-      contextPath: {
-        serializedName: "contextPath",
+      agentPoolName: {
+        serializedName: "agentPoolName",
         type: {
           name: "String"
         }
       },
-      contextAccessToken: {
-        serializedName: "contextAccessToken",
+      logTemplate: {
+        serializedName: "logTemplate",
         type: {
           name: "String"
         }
@@ -3355,17 +1946,11 @@ export const TaskStepProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const BaseImageDependency: coreClient.CompositeMapper = {
+export const ImageDescriptor: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "BaseImageDependency",
+    className: "ImageDescriptor",
     modelProperties: {
-      type: {
-        serializedName: "type",
-        type: {
-          name: "String"
-        }
-      },
       registry: {
         serializedName: "registry",
         type: {
@@ -3394,226 +1979,131 @@ export const BaseImageDependency: coreClient.CompositeMapper = {
   }
 };
 
-export const TriggerProperties: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "TriggerProperties",
-    modelProperties: {
-      timerTriggers: {
-        serializedName: "timerTriggers",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "TimerTrigger"
-            }
-          }
-        }
-      },
-      sourceTriggers: {
-        serializedName: "sourceTriggers",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "SourceTrigger"
-            }
-          }
-        }
-      },
-      baseImageTrigger: {
-        serializedName: "baseImageTrigger",
-        type: {
-          name: "Composite",
-          className: "BaseImageTrigger"
-        }
-      }
-    }
-  }
-};
-
-export const TimerTrigger: coreClient.CompositeMapper = {
+export const ImageUpdateTrigger: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TimerTrigger",
+    className: "ImageUpdateTrigger",
     modelProperties: {
-      schedule: {
-        serializedName: "schedule",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      status: {
-        serializedName: "status",
+      id: {
+        serializedName: "id",
         type: {
           name: "String"
         }
       },
-      name: {
-        serializedName: "name",
-        required: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const SourceTrigger: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "SourceTrigger",
-    modelProperties: {
-      sourceRepository: {
-        serializedName: "sourceRepository",
+      timestamp: {
+        serializedName: "timestamp",
         type: {
-          name: "Composite",
-          className: "SourceProperties"
+          name: "DateTime"
         }
       },
-      sourceTriggerEvents: {
-        serializedName: "sourceTriggerEvents",
-        required: true,
+      images: {
+        serializedName: "images",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "String"
+              name: "Composite",
+              className: "ImageDescriptor"
             }
           }
         }
-      },
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        serializedName: "name",
-        required: true,
-        type: {
-          name: "String"
-        }
       }
     }
   }
 };
 
-export const SourceProperties: coreClient.CompositeMapper = {
+export const SourceTriggerDescriptor: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SourceProperties",
+    className: "SourceTriggerDescriptor",
     modelProperties: {
-      sourceControlType: {
-        serializedName: "sourceControlType",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      repositoryUrl: {
-        serializedName: "repositoryUrl",
-        required: true,
+      id: {
+        serializedName: "id",
         type: {
           name: "String"
         }
       },
-      branch: {
-        serializedName: "branch",
+      eventType: {
+        serializedName: "eventType",
         type: {
           name: "String"
         }
       },
-      sourceControlAuthProperties: {
-        serializedName: "sourceControlAuthProperties",
-        type: {
-          name: "Composite",
-          className: "AuthInfo"
-        }
-      }
-    }
-  }
-};
-
-export const AuthInfo: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AuthInfo",
-    modelProperties: {
-      tokenType: {
-        serializedName: "tokenType",
-        required: true,
+      commitId: {
+        serializedName: "commitId",
         type: {
           name: "String"
         }
       },
-      token: {
-        serializedName: "token",
-        required: true,
+      pullRequestId: {
+        serializedName: "pullRequestId",
         type: {
           name: "String"
         }
       },
-      refreshToken: {
-        serializedName: "refreshToken",
+      repositoryUrl: {
+        serializedName: "repositoryUrl",
         type: {
           name: "String"
         }
       },
-      scope: {
-        serializedName: "scope",
+      branchName: {
+        serializedName: "branchName",
         type: {
           name: "String"
         }
       },
-      expiresIn: {
-        serializedName: "expiresIn",
+      providerType: {
+        serializedName: "providerType",
         type: {
-          name: "Number"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const BaseImageTrigger: coreClient.CompositeMapper = {
+export const TimerTriggerDescriptor: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "BaseImageTrigger",
+    className: "TimerTriggerDescriptor",
     modelProperties: {
-      baseImageTriggerType: {
-        serializedName: "baseImageTriggerType",
-        required: true,
+      timerTriggerName: {
+        serializedName: "timerTriggerName",
         type: {
           name: "String"
         }
       },
-      updateTriggerEndpoint: {
-        serializedName: "updateTriggerEndpoint",
+      scheduleOccurrence: {
+        serializedName: "scheduleOccurrence",
         type: {
           name: "String"
         }
-      },
-      updateTriggerPayloadType: {
-        serializedName: "updateTriggerPayloadType",
+      }
+    }
+  }
+};
+
+export const PlatformProperties: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "PlatformProperties",
+    modelProperties: {
+      os: {
+        serializedName: "os",
+        required: true,
         type: {
           name: "String"
         }
       },
-      status: {
-        serializedName: "status",
+      architecture: {
+        serializedName: "architecture",
         type: {
           name: "String"
         }
       },
-      name: {
-        serializedName: "name",
-        required: true,
+      variant: {
+        serializedName: "variant",
         type: {
           name: "String"
         }
@@ -3622,38 +2112,34 @@ export const BaseImageTrigger: coreClient.CompositeMapper = {
   }
 };
 
-export const Credentials: coreClient.CompositeMapper = {
+export const AgentProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Credentials",
+    className: "AgentProperties",
     modelProperties: {
-      sourceRegistry: {
-        serializedName: "sourceRegistry",
-        type: {
-          name: "Composite",
-          className: "SourceRegistryCredentials"
-        }
-      },
-      customRegistries: {
-        serializedName: "customRegistries",
+      cpu: {
+        serializedName: "cpu",
         type: {
-          name: "Dictionary",
-          value: {
-            type: { name: "Composite", className: "CustomRegistryCredentials" }
-          }
+          name: "Number"
         }
       }
     }
   }
 };
 
-export const SourceRegistryCredentials: coreClient.CompositeMapper = {
+export const SourceUploadDefinition: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SourceRegistryCredentials",
+    className: "SourceUploadDefinition",
     modelProperties: {
-      loginMode: {
-        serializedName: "loginMode",
+      uploadUrl: {
+        serializedName: "uploadUrl",
+        type: {
+          name: "String"
+        }
+      },
+      relativePath: {
+        serializedName: "relativePath",
         type: {
           name: "String"
         }
@@ -3662,48 +2148,61 @@ export const SourceRegistryCredentials: coreClient.CompositeMapper = {
   }
 };
 
-export const CustomRegistryCredentials: coreClient.CompositeMapper = {
+export const RunListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "CustomRegistryCredentials",
+    className: "RunListResult",
     modelProperties: {
-      userName: {
-        serializedName: "userName",
+      value: {
+        serializedName: "value",
         type: {
-          name: "Composite",
-          className: "SecretObject"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "Run"
+            }
+          }
         }
       },
-      password: {
-        serializedName: "password",
+      nextLink: {
+        serializedName: "nextLink",
         type: {
-          name: "Composite",
-          className: "SecretObject"
+          name: "String"
         }
-      },
-      identity: {
-        serializedName: "identity",
+      }
+    }
+  }
+};
+
+export const RunUpdateParameters: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "RunUpdateParameters",
+    modelProperties: {
+      isArchiveEnabled: {
+        serializedName: "isArchiveEnabled",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const SecretObject: coreClient.CompositeMapper = {
+export const RunGetLogResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SecretObject",
+    className: "RunGetLogResult",
     modelProperties: {
-      value: {
-        serializedName: "value",
+      logLink: {
+        serializedName: "logLink",
         type: {
           name: "String"
         }
       },
-      type: {
-        serializedName: "type",
+      logArtifactLink: {
+        serializedName: "logArtifactLink",
         type: {
           name: "String"
         }
@@ -3712,10 +2211,10 @@ export const SecretObject: coreClient.CompositeMapper = {
   }
 };
 
-export const TaskUpdateParameters: coreClient.CompositeMapper = {
+export const TaskRunUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TaskUpdateParameters",
+    className: "TaskRunUpdateParameters",
     modelProperties: {
       identity: {
         serializedName: "identity",
@@ -3724,68 +2223,82 @@ export const TaskUpdateParameters: coreClient.CompositeMapper = {
           className: "IdentityProperties"
         }
       },
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: { type: { name: "String" } }
-        }
-      },
-      status: {
-        serializedName: "properties.status",
+      location: {
+        serializedName: "location",
         type: {
           name: "String"
         }
       },
-      platform: {
-        serializedName: "properties.platform",
+      tags: {
+        serializedName: "tags",
         type: {
-          name: "Composite",
-          className: "PlatformUpdateParameters"
+          name: "Dictionary",
+          value: { type: { name: "String" } }
         }
       },
-      agentConfiguration: {
-        serializedName: "properties.agentConfiguration",
+      runRequest: {
+        serializedName: "properties.runRequest",
         type: {
           name: "Composite",
-          className: "AgentProperties"
+          className: "RunRequest"
         }
       },
-      agentPoolName: {
-        serializedName: "properties.agentPoolName",
+      forceUpdateTag: {
+        serializedName: "properties.forceUpdateTag",
         type: {
           name: "String"
         }
-      },
-      timeout: {
-        serializedName: "properties.timeout",
-        type: {
-          name: "Number"
-        }
-      },
-      step: {
-        serializedName: "properties.step",
+      }
+    }
+  }
+};
+
+export const TaskRunListResult: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "TaskRunListResult",
+    modelProperties: {
+      value: {
+        serializedName: "value",
         type: {
-          name: "Composite",
-          className: "TaskStepUpdateParameters"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "TaskRun"
+            }
+          }
         }
       },
-      trigger: {
-        serializedName: "properties.trigger",
+      nextLink: {
+        serializedName: "nextLink",
         type: {
-          name: "Composite",
-          className: "TriggerUpdateParameters"
+          name: "String"
         }
-      },
-      credentials: {
-        serializedName: "properties.credentials",
+      }
+    }
+  }
+};
+
+export const TaskListResult: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "TaskListResult",
+    modelProperties: {
+      value: {
+        serializedName: "value",
         type: {
-          name: "Composite",
-          className: "Credentials"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "Task"
+            }
+          }
         }
       },
-      logTemplate: {
-        serializedName: "properties.logTemplate",
+      nextLink: {
+        serializedName: "nextLink",
         type: {
           name: "String"
         }
@@ -3794,25 +2307,44 @@ export const TaskUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const PlatformUpdateParameters: coreClient.CompositeMapper = {
+export const TaskStepProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PlatformUpdateParameters",
+    className: "TaskStepProperties",
+    uberParent: "TaskStepProperties",
+    polymorphicDiscriminator: {
+      serializedName: "type",
+      clientName: "type"
+    },
     modelProperties: {
-      os: {
-        serializedName: "os",
+      type: {
+        serializedName: "type",
+        required: true,
         type: {
           name: "String"
         }
       },
-      architecture: {
-        serializedName: "architecture",
+      baseImageDependencies: {
+        serializedName: "baseImageDependencies",
+        readOnly: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "BaseImageDependency"
+            }
+          }
+        }
+      },
+      contextPath: {
+        serializedName: "contextPath",
         type: {
           name: "String"
         }
       },
-      variant: {
-        serializedName: "variant",
+      contextAccessToken: {
+        serializedName: "contextAccessToken",
         type: {
           name: "String"
         }
@@ -3821,31 +2353,37 @@ export const PlatformUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const TaskStepUpdateParameters: coreClient.CompositeMapper = {
+export const BaseImageDependency: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TaskStepUpdateParameters",
-    uberParent: "TaskStepUpdateParameters",
-    polymorphicDiscriminator: {
-      serializedName: "type",
-      clientName: "type"
-    },
+    className: "BaseImageDependency",
     modelProperties: {
       type: {
         serializedName: "type",
-        required: true,
         type: {
           name: "String"
         }
       },
-      contextPath: {
-        serializedName: "contextPath",
+      registry: {
+        serializedName: "registry",
         type: {
           name: "String"
         }
       },
-      contextAccessToken: {
-        serializedName: "contextAccessToken",
+      repository: {
+        serializedName: "repository",
+        type: {
+          name: "String"
+        }
+      },
+      tag: {
+        serializedName: "tag",
+        type: {
+          name: "String"
+        }
+      },
+      digest: {
+        serializedName: "digest",
         type: {
           name: "String"
         }
@@ -3854,10 +2392,10 @@ export const TaskStepUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const TriggerUpdateParameters: coreClient.CompositeMapper = {
+export const TriggerProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TriggerUpdateParameters",
+    className: "TriggerProperties",
     modelProperties: {
       timerTriggers: {
         serializedName: "timerTriggers",
@@ -3866,7 +2404,7 @@ export const TriggerUpdateParameters: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "TimerTriggerUpdateParameters"
+              className: "TimerTrigger"
             }
           }
         }
@@ -3878,7 +2416,7 @@ export const TriggerUpdateParameters: coreClient.CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "SourceTriggerUpdateParameters"
+              className: "SourceTrigger"
             }
           }
         }
@@ -3887,20 +2425,21 @@ export const TriggerUpdateParameters: coreClient.CompositeMapper = {
         serializedName: "baseImageTrigger",
         type: {
           name: "Composite",
-          className: "BaseImageTriggerUpdateParameters"
+          className: "BaseImageTrigger"
         }
       }
     }
   }
 };
 
-export const TimerTriggerUpdateParameters: coreClient.CompositeMapper = {
+export const TimerTrigger: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "TimerTriggerUpdateParameters",
+    className: "TimerTrigger",
     modelProperties: {
       schedule: {
         serializedName: "schedule",
+        required: true,
         type: {
           name: "String"
         }
@@ -3922,20 +2461,21 @@ export const TimerTriggerUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const SourceTriggerUpdateParameters: coreClient.CompositeMapper = {
+export const SourceTrigger: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SourceTriggerUpdateParameters",
+    className: "SourceTrigger",
     modelProperties: {
       sourceRepository: {
         serializedName: "sourceRepository",
         type: {
           name: "Composite",
-          className: "SourceUpdateParameters"
+          className: "SourceProperties"
         }
       },
       sourceTriggerEvents: {
         serializedName: "sourceTriggerEvents",
+        required: true,
         type: {
           name: "Sequence",
           element: {
@@ -3962,19 +2502,21 @@ export const SourceTriggerUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const SourceUpdateParameters: coreClient.CompositeMapper = {
+export const SourceProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SourceUpdateParameters",
+    className: "SourceProperties",
     modelProperties: {
       sourceControlType: {
         serializedName: "sourceControlType",
+        required: true,
         type: {
           name: "String"
         }
       },
       repositoryUrl: {
         serializedName: "repositoryUrl",
+        required: true,
         type: {
           name: "String"
         }
@@ -3989,26 +2531,28 @@ export const SourceUpdateParameters: coreClient.CompositeMapper = {
         serializedName: "sourceControlAuthProperties",
         type: {
           name: "Composite",
-          className: "AuthInfoUpdateParameters"
+          className: "AuthInfo"
         }
       }
     }
   }
 };
 
-export const AuthInfoUpdateParameters: coreClient.CompositeMapper = {
+export const AuthInfo: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "AuthInfoUpdateParameters",
+    className: "AuthInfo",
     modelProperties: {
       tokenType: {
         serializedName: "tokenType",
+        required: true,
         type: {
           name: "String"
         }
       },
       token: {
         serializedName: "token",
+        required: true,
         type: {
           name: "String"
         }
@@ -4035,13 +2579,14 @@ export const AuthInfoUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const BaseImageTriggerUpdateParameters: coreClient.CompositeMapper = {
+export const BaseImageTrigger: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "BaseImageTriggerUpdateParameters",
+    className: "BaseImageTrigger",
     modelProperties: {
       baseImageTriggerType: {
         serializedName: "baseImageTriggerType",
+        required: true,
         type: {
           name: "String"
         }
@@ -4061,12 +2606,184 @@ export const BaseImageTriggerUpdateParameters: coreClient.CompositeMapper = {
       status: {
         serializedName: "status",
         type: {
-          name: "String"
+          name: "String"
+        }
+      },
+      name: {
+        serializedName: "name",
+        required: true,
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const Credentials: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "Credentials",
+    modelProperties: {
+      sourceRegistry: {
+        serializedName: "sourceRegistry",
+        type: {
+          name: "Composite",
+          className: "SourceRegistryCredentials"
+        }
+      },
+      customRegistries: {
+        serializedName: "customRegistries",
+        type: {
+          name: "Dictionary",
+          value: {
+            type: { name: "Composite", className: "CustomRegistryCredentials" }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const SourceRegistryCredentials: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "SourceRegistryCredentials",
+    modelProperties: {
+      loginMode: {
+        serializedName: "loginMode",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const CustomRegistryCredentials: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "CustomRegistryCredentials",
+    modelProperties: {
+      userName: {
+        serializedName: "userName",
+        type: {
+          name: "Composite",
+          className: "SecretObject"
+        }
+      },
+      password: {
+        serializedName: "password",
+        type: {
+          name: "Composite",
+          className: "SecretObject"
+        }
+      },
+      identity: {
+        serializedName: "identity",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const SecretObject: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "SecretObject",
+    modelProperties: {
+      value: {
+        serializedName: "value",
+        type: {
+          name: "String"
+        }
+      },
+      type: {
+        serializedName: "type",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const TaskUpdateParameters: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "TaskUpdateParameters",
+    modelProperties: {
+      identity: {
+        serializedName: "identity",
+        type: {
+          name: "Composite",
+          className: "IdentityProperties"
+        }
+      },
+      tags: {
+        serializedName: "tags",
+        type: {
+          name: "Dictionary",
+          value: { type: { name: "String" } }
+        }
+      },
+      status: {
+        serializedName: "properties.status",
+        type: {
+          name: "String"
+        }
+      },
+      platform: {
+        serializedName: "properties.platform",
+        type: {
+          name: "Composite",
+          className: "PlatformUpdateParameters"
+        }
+      },
+      agentConfiguration: {
+        serializedName: "properties.agentConfiguration",
+        type: {
+          name: "Composite",
+          className: "AgentProperties"
+        }
+      },
+      agentPoolName: {
+        serializedName: "properties.agentPoolName",
+        type: {
+          name: "String"
+        }
+      },
+      timeout: {
+        serializedName: "properties.timeout",
+        type: {
+          name: "Number"
+        }
+      },
+      step: {
+        serializedName: "properties.step",
+        type: {
+          name: "Composite",
+          className: "TaskStepUpdateParameters"
+        }
+      },
+      trigger: {
+        serializedName: "properties.trigger",
+        type: {
+          name: "Composite",
+          className: "TriggerUpdateParameters"
+        }
+      },
+      credentials: {
+        serializedName: "properties.credentials",
+        type: {
+          name: "Composite",
+          className: "Credentials"
         }
       },
-      name: {
-        serializedName: "name",
-        required: true,
+      logTemplate: {
+        serializedName: "properties.logTemplate",
         type: {
           name: "String"
         }
@@ -4075,19 +2792,25 @@ export const BaseImageTriggerUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
-export const ActiveDirectoryObject: coreClient.CompositeMapper = {
+export const PlatformUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ActiveDirectoryObject",
+    className: "PlatformUpdateParameters",
     modelProperties: {
-      objectId: {
-        serializedName: "objectId",
+      os: {
+        serializedName: "os",
         type: {
           name: "String"
         }
       },
-      tenantId: {
-        serializedName: "tenantId",
+      architecture: {
+        serializedName: "architecture",
+        type: {
+          name: "String"
+        }
+      },
+      variant: {
+        serializedName: "variant",
         type: {
           name: "String"
         }
@@ -4096,61 +2819,31 @@ export const ActiveDirectoryObject: coreClient.CompositeMapper = {
   }
 };
 
-export const RunFilter: coreClient.CompositeMapper = {
+export const TaskStepUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "RunFilter",
+    className: "TaskStepUpdateParameters",
+    uberParent: "TaskStepUpdateParameters",
+    polymorphicDiscriminator: {
+      serializedName: "type",
+      clientName: "type"
+    },
     modelProperties: {
-      runId: {
-        serializedName: "runId",
-        type: {
-          name: "String"
-        }
-      },
-      runType: {
-        serializedName: "runType",
-        type: {
-          name: "String"
-        }
-      },
-      status: {
-        serializedName: "status",
-        type: {
-          name: "String"
-        }
-      },
-      createTime: {
-        serializedName: "createTime",
-        type: {
-          name: "DateTime"
-        }
-      },
-      finishTime: {
-        serializedName: "finishTime",
-        type: {
-          name: "DateTime"
-        }
-      },
-      outputImageManifests: {
-        serializedName: "outputImageManifests",
+      type: {
+        serializedName: "type",
+        required: true,
         type: {
           name: "String"
         }
       },
-      isArchiveEnabled: {
-        serializedName: "isArchiveEnabled",
-        type: {
-          name: "Boolean"
-        }
-      },
-      taskName: {
-        serializedName: "taskName",
+      contextPath: {
+        serializedName: "contextPath",
         type: {
           name: "String"
         }
       },
-      agentPoolName: {
-        serializedName: "agentPoolName",
+      contextAccessToken: {
+        serializedName: "contextAccessToken",
         type: {
           name: "String"
         }
@@ -4159,115 +2852,106 @@ export const RunFilter: coreClient.CompositeMapper = {
   }
 };
 
-export const Argument: coreClient.CompositeMapper = {
+export const TriggerUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Argument",
+    className: "TriggerUpdateParameters",
     modelProperties: {
-      name: {
-        serializedName: "name",
-        required: true,
+      timerTriggers: {
+        serializedName: "timerTriggers",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "TimerTriggerUpdateParameters"
+            }
+          }
         }
       },
-      value: {
-        serializedName: "value",
-        required: true,
+      sourceTriggers: {
+        serializedName: "sourceTriggers",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "SourceTriggerUpdateParameters"
+            }
+          }
         }
       },
-      isSecret: {
-        defaultValue: false,
-        serializedName: "isSecret",
+      baseImageTrigger: {
+        serializedName: "baseImageTrigger",
         type: {
-          name: "Boolean"
+          name: "Composite",
+          className: "BaseImageTriggerUpdateParameters"
         }
       }
     }
   }
 };
 
-export const SetValue: coreClient.CompositeMapper = {
+export const TimerTriggerUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SetValue",
+    className: "TimerTriggerUpdateParameters",
     modelProperties: {
-      name: {
-        serializedName: "name",
-        required: true,
+      schedule: {
+        serializedName: "schedule",
         type: {
           name: "String"
         }
       },
-      value: {
-        serializedName: "value",
-        required: true,
+      status: {
+        serializedName: "status",
         type: {
           name: "String"
         }
       },
-      isSecret: {
-        defaultValue: false,
-        serializedName: "isSecret",
+      name: {
+        serializedName: "name",
+        required: true,
         type: {
-          name: "Boolean"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const OverrideTaskStepProperties: coreClient.CompositeMapper = {
+export const SourceTriggerUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "OverrideTaskStepProperties",
+    className: "SourceTriggerUpdateParameters",
     modelProperties: {
-      contextPath: {
-        serializedName: "contextPath",
-        type: {
-          name: "String"
-        }
-      },
-      file: {
-        serializedName: "file",
+      sourceRepository: {
+        serializedName: "sourceRepository",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "SourceUpdateParameters"
         }
       },
-      arguments: {
-        serializedName: "arguments",
+      sourceTriggerEvents: {
+        serializedName: "sourceTriggerEvents",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "Composite",
-              className: "Argument"
+              name: "String"
             }
           }
         }
       },
-      target: {
-        serializedName: "target",
+      status: {
+        serializedName: "status",
         type: {
           name: "String"
         }
       },
-      values: {
-        serializedName: "values",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "SetValue"
-            }
-          }
-        }
-      },
-      updateTriggerToken: {
-        serializedName: "updateTriggerToken",
+      name: {
+        serializedName: "name",
+        required: true,
         type: {
           name: "String"
         }
@@ -4276,152 +2960,148 @@ export const OverrideTaskStepProperties: coreClient.CompositeMapper = {
   }
 };
 
-export const ConnectedRegistry: coreClient.CompositeMapper = {
+export const SourceUpdateParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ConnectedRegistry",
+    className: "SourceUpdateParameters",
     modelProperties: {
-      ...ProxyResource.type.modelProperties,
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
+      sourceControlType: {
+        serializedName: "sourceControlType",
         type: {
           name: "String"
         }
       },
-      mode: {
-        serializedName: "properties.mode",
+      repositoryUrl: {
+        serializedName: "repositoryUrl",
         type: {
           name: "String"
         }
       },
-      version: {
-        serializedName: "properties.version",
-        readOnly: true,
+      branch: {
+        serializedName: "branch",
         type: {
           name: "String"
         }
       },
-      connectionState: {
-        serializedName: "properties.connectionState",
-        readOnly: true,
+      sourceControlAuthProperties: {
+        serializedName: "sourceControlAuthProperties",
+        type: {
+          name: "Composite",
+          className: "AuthInfoUpdateParameters"
+        }
+      }
+    }
+  }
+};
+
+export const AuthInfoUpdateParameters: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "AuthInfoUpdateParameters",
+    modelProperties: {
+      tokenType: {
+        serializedName: "tokenType",
         type: {
           name: "String"
         }
       },
-      lastActivityTime: {
-        serializedName: "properties.lastActivityTime",
-        readOnly: true,
+      token: {
+        serializedName: "token",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      activation: {
-        serializedName: "properties.activation",
+      refreshToken: {
+        serializedName: "refreshToken",
         type: {
-          name: "Composite",
-          className: "ActivationProperties"
+          name: "String"
         }
       },
-      parent: {
-        serializedName: "properties.parent",
+      scope: {
+        serializedName: "scope",
         type: {
-          name: "Composite",
-          className: "ParentProperties"
+          name: "String"
         }
       },
-      clientTokenIds: {
-        serializedName: "properties.clientTokenIds",
+      expiresIn: {
+        serializedName: "expiresIn",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "Number"
+        }
+      }
+    }
+  }
+};
+
+export const BaseImageTriggerUpdateParameters: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "BaseImageTriggerUpdateParameters",
+    modelProperties: {
+      baseImageTriggerType: {
+        serializedName: "baseImageTriggerType",
+        type: {
+          name: "String"
         }
       },
-      loginServer: {
-        serializedName: "properties.loginServer",
+      updateTriggerEndpoint: {
+        serializedName: "updateTriggerEndpoint",
         type: {
-          name: "Composite",
-          className: "LoginServerProperties"
+          name: "String"
         }
       },
-      logging: {
-        serializedName: "properties.logging",
+      updateTriggerPayloadType: {
+        serializedName: "updateTriggerPayloadType",
         type: {
-          name: "Composite",
-          className: "LoggingProperties"
+          name: "String"
         }
       },
-      statusDetails: {
-        serializedName: "properties.statusDetails",
-        readOnly: true,
+      status: {
+        serializedName: "status",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "StatusDetailProperties"
-            }
-          }
+          name: "String"
         }
       },
-      notificationsList: {
-        serializedName: "properties.notificationsList",
+      name: {
+        serializedName: "name",
+        required: true,
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ExportPipeline: coreClient.CompositeMapper = {
+export const StorageAccountProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ExportPipeline",
+    className: "StorageAccountProperties",
     modelProperties: {
-      ...ProxyResource.type.modelProperties,
-      location: {
-        serializedName: "location",
+      id: {
+        serializedName: "id",
+        required: true,
         type: {
           name: "String"
         }
-      },
-      identity: {
-        serializedName: "identity",
-        type: {
-          name: "Composite",
-          className: "IdentityProperties"
-        }
-      },
-      target: {
-        serializedName: "properties.target",
-        type: {
-          name: "Composite",
-          className: "ExportPipelineTargetProperties"
-        }
-      },
-      options: {
-        serializedName: "properties.options",
+      }
+    }
+  }
+};
+
+export const PackageType: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "PackageType",
+    modelProperties: {
+      name: {
+        serializedName: "name",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      provisioningState: {
-        serializedName: "properties.provisioningState",
+      endpoint: {
+        serializedName: "endpoint",
         readOnly: true,
         type: {
           name: "String"
@@ -4431,53 +3111,61 @@ export const ExportPipeline: coreClient.CompositeMapper = {
   }
 };
 
-export const ImportPipeline: coreClient.CompositeMapper = {
+export const RunFilter: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ImportPipeline",
+    className: "RunFilter",
     modelProperties: {
-      ...ProxyResource.type.modelProperties,
-      location: {
-        serializedName: "location",
+      runId: {
+        serializedName: "runId",
         type: {
           name: "String"
         }
       },
-      identity: {
-        serializedName: "identity",
+      runType: {
+        serializedName: "runType",
         type: {
-          name: "Composite",
-          className: "IdentityProperties"
+          name: "String"
         }
       },
-      source: {
-        serializedName: "properties.source",
+      status: {
+        serializedName: "status",
         type: {
-          name: "Composite",
-          className: "ImportPipelineSourceProperties"
+          name: "String"
         }
       },
-      trigger: {
-        serializedName: "properties.trigger",
+      createTime: {
+        serializedName: "createTime",
         type: {
-          name: "Composite",
-          className: "PipelineTriggerProperties"
+          name: "DateTime"
         }
       },
-      options: {
-        serializedName: "properties.options",
+      finishTime: {
+        serializedName: "finishTime",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "DateTime"
         }
       },
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
+      outputImageManifests: {
+        serializedName: "outputImageManifests",
+        type: {
+          name: "String"
+        }
+      },
+      isArchiveEnabled: {
+        serializedName: "isArchiveEnabled",
+        type: {
+          name: "Boolean"
+        }
+      },
+      taskName: {
+        serializedName: "taskName",
+        type: {
+          name: "String"
+        }
+      },
+      agentPoolName: {
+        serializedName: "agentPoolName",
         type: {
           name: "String"
         }
@@ -4486,157 +3174,146 @@ export const ImportPipeline: coreClient.CompositeMapper = {
   }
 };
 
-export const PipelineRun: coreClient.CompositeMapper = {
+export const Argument: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PipelineRun",
+    className: "Argument",
     modelProperties: {
-      ...ProxyResource.type.modelProperties,
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
+      name: {
+        serializedName: "name",
+        required: true,
         type: {
           name: "String"
         }
       },
-      request: {
-        serializedName: "properties.request",
-        type: {
-          name: "Composite",
-          className: "PipelineRunRequest"
-        }
-      },
-      response: {
-        serializedName: "properties.response",
+      value: {
+        serializedName: "value",
+        required: true,
         type: {
-          name: "Composite",
-          className: "PipelineRunResponse"
+          name: "String"
         }
       },
-      forceUpdateTag: {
-        serializedName: "properties.forceUpdateTag",
+      isSecret: {
+        defaultValue: false,
+        serializedName: "isSecret",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const PrivateEndpointConnection: coreClient.CompositeMapper = {
+export const SetValue: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "PrivateEndpointConnection",
+    className: "SetValue",
     modelProperties: {
-      ...ProxyResource.type.modelProperties,
-      privateEndpoint: {
-        serializedName: "properties.privateEndpoint",
+      name: {
+        serializedName: "name",
+        required: true,
         type: {
-          name: "Composite",
-          className: "PrivateEndpoint"
+          name: "String"
         }
       },
-      privateLinkServiceConnectionState: {
-        serializedName: "properties.privateLinkServiceConnectionState",
+      value: {
+        serializedName: "value",
+        required: true,
         type: {
-          name: "Composite",
-          className: "PrivateLinkServiceConnectionState"
+          name: "String"
         }
       },
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
+      isSecret: {
+        defaultValue: false,
+        serializedName: "isSecret",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const ScopeMap: coreClient.CompositeMapper = {
+export const OverrideTaskStepProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ScopeMap",
+    className: "OverrideTaskStepProperties",
     modelProperties: {
-      ...ProxyResource.type.modelProperties,
-      description: {
-        serializedName: "properties.description",
+      contextPath: {
+        serializedName: "contextPath",
         type: {
           name: "String"
         }
       },
-      typePropertiesType: {
-        serializedName: "properties.type",
-        readOnly: true,
+      file: {
+        serializedName: "file",
         type: {
           name: "String"
         }
       },
-      creationDate: {
-        serializedName: "properties.creationDate",
-        readOnly: true,
+      arguments: {
+        serializedName: "arguments",
         type: {
-          name: "DateTime"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "Argument"
+            }
+          }
         }
       },
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
+      target: {
+        serializedName: "target",
         type: {
           name: "String"
         }
       },
-      actions: {
-        serializedName: "properties.actions",
+      values: {
+        serializedName: "values",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "String"
+              name: "Composite",
+              className: "SetValue"
             }
           }
         }
+      },
+      updateTriggerToken: {
+        serializedName: "updateTriggerToken",
+        type: {
+          name: "String"
+        }
       }
     }
   }
 };
 
-export const Token: coreClient.CompositeMapper = {
+export const PrivateEndpointConnection: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Token",
+    className: "PrivateEndpointConnection",
     modelProperties: {
       ...ProxyResource.type.modelProperties,
-      creationDate: {
-        serializedName: "properties.creationDate",
-        readOnly: true,
-        type: {
-          name: "DateTime"
-        }
-      },
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      scopeMapId: {
-        serializedName: "properties.scopeMapId",
+      privateEndpoint: {
+        serializedName: "properties.privateEndpoint",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "PrivateEndpoint"
         }
       },
-      credentials: {
-        serializedName: "properties.credentials",
+      privateLinkServiceConnectionState: {
+        serializedName: "properties.privateLinkServiceConnectionState",
         type: {
           name: "Composite",
-          className: "TokenCredentialsProperties"
+          className: "PrivateLinkServiceConnectionState"
         }
       },
-      status: {
-        serializedName: "properties.status",
+      provisioningState: {
+        serializedName: "properties.provisioningState",
+        readOnly: true,
         type: {
           name: "String"
         }
@@ -4980,13 +3657,6 @@ export const Registry: coreClient.CompositeMapper = {
         type: {
           name: "String"
         }
-      },
-      anonymousPullEnabled: {
-        defaultValue: false,
-        serializedName: "properties.anonymousPullEnabled",
-        type: {
-          name: "Boolean"
-        }
       }
     }
   }
diff --git a/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts b/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts
index 1efcc84fa650..83054d23eadb 100644
--- a/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts
@@ -12,25 +12,15 @@ import {
   OperationQueryParameter
 } from "@azure/core-client";
 import {
-  ConnectedRegistry as ConnectedRegistryMapper,
-  ConnectedRegistryUpdateParameters as ConnectedRegistryUpdateParametersMapper,
-  ExportPipeline as ExportPipelineMapper,
   ImportImageParameters as ImportImageParametersMapper,
   RegistryNameCheckRequest as RegistryNameCheckRequestMapper,
   Registry as RegistryMapper,
   RegistryUpdateParameters as RegistryUpdateParametersMapper,
   RegenerateCredentialParameters as RegenerateCredentialParametersMapper,
-  GenerateCredentialsParameters as GenerateCredentialsParametersMapper,
   RunRequest as RunRequestMapper,
-  ImportPipeline as ImportPipelineMapper,
-  PipelineRun as PipelineRunMapper,
   PrivateEndpointConnection as PrivateEndpointConnectionMapper,
   Replication as ReplicationMapper,
   ReplicationUpdateParameters as ReplicationUpdateParametersMapper,
-  ScopeMap as ScopeMapMapper,
-  ScopeMapUpdateParameters as ScopeMapUpdateParametersMapper,
-  Token as TokenMapper,
-  TokenUpdateParameters as TokenUpdateParametersMapper,
   WebhookCreateParameters as WebhookCreateParametersMapper,
   WebhookUpdateParameters as WebhookUpdateParametersMapper,
   AgentPool as AgentPoolMapper,
@@ -42,18 +32,23 @@ import {
   TaskUpdateParameters as TaskUpdateParametersMapper
 } from "../models/mappers";
 
-export const accept: OperationParameter = {
-  parameterPath: "accept",
+export const contentType: OperationParameter = {
+  parameterPath: ["options", "contentType"],
   mapper: {
     defaultValue: "application/json",
     isConstant: true,
-    serializedName: "Accept",
+    serializedName: "Content-Type",
     type: {
       name: "String"
     }
   }
 };
 
+export const parameters: OperationParameter = {
+  parameterPath: "parameters",
+  mapper: ImportImageParametersMapper
+};
+
 export const $host: OperationURLParameter = {
   parameterPath: "$host",
   mapper: {
@@ -69,7 +64,7 @@ export const $host: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2021-08-01-preview",
+    defaultValue: "2021-09-01",
     isConstant: true,
     serializedName: "api-version",
     type: {
@@ -119,75 +114,37 @@ export const registryName: OperationURLParameter = {
   }
 };
 
-export const filter: OperationQueryParameter = {
-  parameterPath: ["options", "filter"],
-  mapper: {
-    serializedName: "$filter",
-    type: {
-      name: "String"
-    }
-  }
-};
-
-export const connectedRegistryName: OperationURLParameter = {
-  parameterPath: "connectedRegistryName",
-  mapper: {
-    constraints: {
-      Pattern: new RegExp("^[a-zA-Z0-9]*$"),
-      MaxLength: 50,
-      MinLength: 5
-    },
-    serializedName: "connectedRegistryName",
-    required: true,
-    type: {
-      name: "String"
-    }
-  }
+export const registryNameCheckRequest: OperationParameter = {
+  parameterPath: "registryNameCheckRequest",
+  mapper: RegistryNameCheckRequestMapper
 };
 
-export const contentType: OperationParameter = {
-  parameterPath: ["options", "contentType"],
+export const accept: OperationParameter = {
+  parameterPath: "accept",
   mapper: {
     defaultValue: "application/json",
     isConstant: true,
-    serializedName: "Content-Type",
+    serializedName: "Accept",
     type: {
       name: "String"
     }
   }
 };
 
-export const connectedRegistryCreateParameters: OperationParameter = {
-  parameterPath: "connectedRegistryCreateParameters",
-  mapper: ConnectedRegistryMapper
-};
-
-export const connectedRegistryUpdateParameters: OperationParameter = {
-  parameterPath: "connectedRegistryUpdateParameters",
-  mapper: ConnectedRegistryUpdateParametersMapper
+export const registry: OperationParameter = {
+  parameterPath: "registry",
+  mapper: RegistryMapper
 };
 
-export const nextLink: OperationURLParameter = {
-  parameterPath: "nextLink",
-  mapper: {
-    serializedName: "nextLink",
-    required: true,
-    type: {
-      name: "String"
-    }
-  },
-  skipEncoding: true
+export const registryUpdateParameters: OperationParameter = {
+  parameterPath: "registryUpdateParameters",
+  mapper: RegistryUpdateParametersMapper
 };
 
-export const exportPipelineName: OperationURLParameter = {
-  parameterPath: "exportPipelineName",
+export const groupName: OperationURLParameter = {
+  parameterPath: "groupName",
   mapper: {
-    constraints: {
-      Pattern: new RegExp("^[a-zA-Z0-9]*$"),
-      MaxLength: 50,
-      MinLength: 5
-    },
-    serializedName: "exportPipelineName",
+    serializedName: "groupName",
     required: true,
     type: {
       name: "String"
@@ -195,41 +152,11 @@ export const exportPipelineName: OperationURLParameter = {
   }
 };
 
-export const exportPipelineCreateParameters: OperationParameter = {
-  parameterPath: "exportPipelineCreateParameters",
-  mapper: ExportPipelineMapper
-};
-
-export const parameters: OperationParameter = {
-  parameterPath: "parameters",
-  mapper: ImportImageParametersMapper
-};
-
-export const registryNameCheckRequest: OperationParameter = {
-  parameterPath: "registryNameCheckRequest",
-  mapper: RegistryNameCheckRequestMapper
-};
-
-export const registry: OperationParameter = {
-  parameterPath: "registry",
-  mapper: RegistryMapper
-};
-
-export const registryUpdateParameters: OperationParameter = {
-  parameterPath: "registryUpdateParameters",
-  mapper: RegistryUpdateParametersMapper
-};
-
 export const regenerateCredentialParameters: OperationParameter = {
   parameterPath: "regenerateCredentialParameters",
   mapper: RegenerateCredentialParametersMapper
 };
 
-export const generateCredentialsParameters: OperationParameter = {
-  parameterPath: "generateCredentialsParameters",
-  mapper: GenerateCredentialsParametersMapper
-};
-
 export const runRequest: OperationParameter = {
   parameterPath: "runRequest",
   mapper: RunRequestMapper
@@ -247,46 +174,16 @@ export const apiVersion1: OperationQueryParameter = {
   }
 };
 
-export const importPipelineName: OperationURLParameter = {
-  parameterPath: "importPipelineName",
-  mapper: {
-    constraints: {
-      Pattern: new RegExp("^[a-zA-Z0-9]*$"),
-      MaxLength: 50,
-      MinLength: 5
-    },
-    serializedName: "importPipelineName",
-    required: true,
-    type: {
-      name: "String"
-    }
-  }
-};
-
-export const importPipelineCreateParameters: OperationParameter = {
-  parameterPath: "importPipelineCreateParameters",
-  mapper: ImportPipelineMapper
-};
-
-export const pipelineRunName: OperationURLParameter = {
-  parameterPath: "pipelineRunName",
+export const nextLink: OperationURLParameter = {
+  parameterPath: "nextLink",
   mapper: {
-    constraints: {
-      Pattern: new RegExp("^[a-zA-Z0-9]*$"),
-      MaxLength: 50,
-      MinLength: 5
-    },
-    serializedName: "pipelineRunName",
+    serializedName: "nextLink",
     required: true,
     type: {
       name: "String"
     }
-  }
-};
-
-export const pipelineRunCreateParameters: OperationParameter = {
-  parameterPath: "pipelineRunCreateParameters",
-  mapper: PipelineRunMapper
+  },
+  skipEncoding: true
 };
 
 export const privateEndpointConnectionName: OperationURLParameter = {
@@ -331,58 +228,6 @@ export const replicationUpdateParameters: OperationParameter = {
   mapper: ReplicationUpdateParametersMapper
 };
 
-export const scopeMapName: OperationURLParameter = {
-  parameterPath: "scopeMapName",
-  mapper: {
-    constraints: {
-      Pattern: new RegExp("^[a-zA-Z0-9-_]*$"),
-      MaxLength: 50,
-      MinLength: 5
-    },
-    serializedName: "scopeMapName",
-    required: true,
-    type: {
-      name: "String"
-    }
-  }
-};
-
-export const scopeMapCreateParameters: OperationParameter = {
-  parameterPath: "scopeMapCreateParameters",
-  mapper: ScopeMapMapper
-};
-
-export const scopeMapUpdateParameters: OperationParameter = {
-  parameterPath: "scopeMapUpdateParameters",
-  mapper: ScopeMapUpdateParametersMapper
-};
-
-export const tokenName: OperationURLParameter = {
-  parameterPath: "tokenName",
-  mapper: {
-    constraints: {
-      Pattern: new RegExp("^[a-zA-Z0-9-]*$"),
-      MaxLength: 50,
-      MinLength: 5
-    },
-    serializedName: "tokenName",
-    required: true,
-    type: {
-      name: "String"
-    }
-  }
-};
-
-export const tokenCreateParameters: OperationParameter = {
-  parameterPath: "tokenCreateParameters",
-  mapper: TokenMapper
-};
-
-export const tokenUpdateParameters: OperationParameter = {
-  parameterPath: "tokenUpdateParameters",
-  mapper: TokenUpdateParametersMapper
-};
-
 export const webhookName: OperationURLParameter = {
   parameterPath: "webhookName",
   mapper: {
@@ -435,6 +280,16 @@ export const updateParameters: OperationParameter = {
   mapper: AgentPoolUpdateParametersMapper
 };
 
+export const filter: OperationQueryParameter = {
+  parameterPath: ["options", "filter"],
+  mapper: {
+    serializedName: "$filter",
+    type: {
+      name: "String"
+    }
+  }
+};
+
 export const top: OperationQueryParameter = {
   parameterPath: ["options", "top"],
   mapper: {
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts b/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts
index cdc27525f737..675d3fdc39ca 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts
@@ -11,7 +11,7 @@ import { AgentPools } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -35,13 +35,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing AgentPools operations. */
 export class AgentPoolsImpl implements AgentPools {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class AgentPools class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -515,7 +515,7 @@ const createOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.agentPoolName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -573,7 +573,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.agentPoolName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts b/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts
deleted file mode 100644
index 3fa9f4dec25b..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts
+++ /dev/null
@@ -1,718 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { ConnectedRegistries } from "../operationsInterfaces";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers";
-import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
-import {
-  ConnectedRegistry,
-  ConnectedRegistriesListNextOptionalParams,
-  ConnectedRegistriesListOptionalParams,
-  ConnectedRegistriesListResponse,
-  ConnectedRegistriesGetOptionalParams,
-  ConnectedRegistriesGetResponse,
-  ConnectedRegistriesCreateOptionalParams,
-  ConnectedRegistriesCreateResponse,
-  ConnectedRegistriesDeleteOptionalParams,
-  ConnectedRegistryUpdateParameters,
-  ConnectedRegistriesUpdateOptionalParams,
-  ConnectedRegistriesUpdateResponse,
-  ConnectedRegistriesDeactivateOptionalParams,
-  ConnectedRegistriesListNextResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing ConnectedRegistries operations. */
-export class ConnectedRegistriesImpl implements ConnectedRegistries {
-  private readonly client: ContainerRegistryManagementClientContext;
-
-  /**
-   * Initialize a new instance of the class ConnectedRegistries class.
-   * @param client Reference to the service client
-   */
-  constructor(client: ContainerRegistryManagementClientContext) {
-    this.client = client;
-  }
-
-  /**
-   * Lists all connected registries for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ConnectedRegistriesListOptionalParams
-  ): PagedAsyncIterableIterator<ConnectedRegistry> {
-    const iter = this.listPagingAll(resourceGroupName, registryName, options);
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, registryName, options);
-      }
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ConnectedRegistriesListOptionalParams
-  ): AsyncIterableIterator<ConnectedRegistry[]> {
-    let result = await this._list(resourceGroupName, registryName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        registryName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ConnectedRegistriesListOptionalParams
-  ): AsyncIterableIterator<ConnectedRegistry> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      registryName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Lists all connected registries for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ConnectedRegistriesListOptionalParams
-  ): Promise<ConnectedRegistriesListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, options },
-      listOperationSpec
-    );
-  }
-
-  /**
-   * Gets the properties of the connected registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesGetOptionalParams
-  ): Promise<ConnectedRegistriesGetResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, connectedRegistryName, options },
-      getOperationSpec
-    );
-  }
-
-  /**
-   * Creates a connected registry for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryCreateParameters The parameters for creating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  async beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryCreateParameters: ConnectedRegistry,
-    options?: ConnectedRegistriesCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ConnectedRegistriesCreateResponse>,
-      ConnectedRegistriesCreateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<ConnectedRegistriesCreateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        connectedRegistryName,
-        connectedRegistryCreateParameters,
-        options
-      },
-      createOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Creates a connected registry for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryCreateParameters The parameters for creating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  async beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryCreateParameters: ConnectedRegistry,
-    options?: ConnectedRegistriesCreateOptionalParams
-  ): Promise<ConnectedRegistriesCreateResponse> {
-    const poller = await this.beginCreate(
-      resourceGroupName,
-      registryName,
-      connectedRegistryName,
-      connectedRegistryCreateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deletes a connected registry from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, connectedRegistryName, options },
-      deleteOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deletes a connected registry from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeleteOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      registryName,
-      connectedRegistryName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Updates a connected registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryUpdateParameters The parameters for updating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  async beginUpdate(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryUpdateParameters: ConnectedRegistryUpdateParameters,
-    options?: ConnectedRegistriesUpdateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ConnectedRegistriesUpdateResponse>,
-      ConnectedRegistriesUpdateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<ConnectedRegistriesUpdateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        connectedRegistryName,
-        connectedRegistryUpdateParameters,
-        options
-      },
-      updateOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Updates a connected registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryUpdateParameters The parameters for updating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  async beginUpdateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryUpdateParameters: ConnectedRegistryUpdateParameters,
-    options?: ConnectedRegistriesUpdateOptionalParams
-  ): Promise<ConnectedRegistriesUpdateResponse> {
-    const poller = await this.beginUpdate(
-      resourceGroupName,
-      registryName,
-      connectedRegistryName,
-      connectedRegistryUpdateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deactivates the connected registry instance.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  async beginDeactivate(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeactivateOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, connectedRegistryName, options },
-      deactivateOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deactivates the connected registry instance.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  async beginDeactivateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeactivateOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDeactivate(
-      resourceGroupName,
-      registryName,
-      connectedRegistryName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    registryName: string,
-    nextLink: string,
-    options?: ConnectedRegistriesListNextOptionalParams
-  ): Promise<ConnectedRegistriesListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, nextLink, options },
-      listNextOperationSpec
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const listOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/connectedRegistries",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ConnectedRegistryListResult
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  queryParameters: [Parameters.apiVersion, Parameters.filter],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/connectedRegistries/{connectedRegistryName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.connectedRegistryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const createOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/connectedRegistries/{connectedRegistryName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    201: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    202: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    204: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  requestBody: Parameters.connectedRegistryCreateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.connectedRegistryName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/connectedRegistries/{connectedRegistryName}",
-  httpMethod: "DELETE",
-  responses: {
-    200: {},
-    201: {},
-    202: {},
-    204: {},
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.connectedRegistryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const updateOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/connectedRegistries/{connectedRegistryName}",
-  httpMethod: "PATCH",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    201: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    202: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    204: {
-      bodyMapper: Mappers.ConnectedRegistry
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  requestBody: Parameters.connectedRegistryUpdateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.connectedRegistryName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deactivateOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/connectedRegistries/{connectedRegistryName}/deactivate",
-  httpMethod: "POST",
-  responses: {
-    200: {},
-    201: {},
-    202: {},
-    204: {},
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.connectedRegistryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ConnectedRegistryListResult
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse
-    }
-  },
-  queryParameters: [Parameters.apiVersion, Parameters.filter],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.nextLink
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts b/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts
deleted file mode 100644
index 81f8231a3238..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { ExportPipelines } from "../operationsInterfaces";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers";
-import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
-import {
-  ExportPipeline,
-  ExportPipelinesListNextOptionalParams,
-  ExportPipelinesListOptionalParams,
-  ExportPipelinesListResponse,
-  ExportPipelinesGetOptionalParams,
-  ExportPipelinesGetResponse,
-  ExportPipelinesCreateOptionalParams,
-  ExportPipelinesCreateResponse,
-  ExportPipelinesDeleteOptionalParams,
-  ExportPipelinesListNextResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing ExportPipelines operations. */
-export class ExportPipelinesImpl implements ExportPipelines {
-  private readonly client: ContainerRegistryManagementClientContext;
-
-  /**
-   * Initialize a new instance of the class ExportPipelines class.
-   * @param client Reference to the service client
-   */
-  constructor(client: ContainerRegistryManagementClientContext) {
-    this.client = client;
-  }
-
-  /**
-   * Lists all export pipelines for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ExportPipelinesListOptionalParams
-  ): PagedAsyncIterableIterator<ExportPipeline> {
-    const iter = this.listPagingAll(resourceGroupName, registryName, options);
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, registryName, options);
-      }
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ExportPipelinesListOptionalParams
-  ): AsyncIterableIterator<ExportPipeline[]> {
-    let result = await this._list(resourceGroupName, registryName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        registryName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ExportPipelinesListOptionalParams
-  ): AsyncIterableIterator<ExportPipeline> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      registryName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Lists all export pipelines for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ExportPipelinesListOptionalParams
-  ): Promise<ExportPipelinesListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, options },
-      listOperationSpec
-    );
-  }
-
-  /**
-   * Gets the properties of the export pipeline.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    options?: ExportPipelinesGetOptionalParams
-  ): Promise<ExportPipelinesGetResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, exportPipelineName, options },
-      getOperationSpec
-    );
-  }
-
-  /**
-   * Creates an export pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param exportPipelineCreateParameters The parameters for creating an export pipeline.
-   * @param options The options parameters.
-   */
-  async beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    exportPipelineCreateParameters: ExportPipeline,
-    options?: ExportPipelinesCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ExportPipelinesCreateResponse>,
-      ExportPipelinesCreateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<ExportPipelinesCreateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        exportPipelineName,
-        exportPipelineCreateParameters,
-        options
-      },
-      createOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Creates an export pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param exportPipelineCreateParameters The parameters for creating an export pipeline.
-   * @param options The options parameters.
-   */
-  async beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    exportPipelineCreateParameters: ExportPipeline,
-    options?: ExportPipelinesCreateOptionalParams
-  ): Promise<ExportPipelinesCreateResponse> {
-    const poller = await this.beginCreate(
-      resourceGroupName,
-      registryName,
-      exportPipelineName,
-      exportPipelineCreateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deletes an export pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    options?: ExportPipelinesDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, exportPipelineName, options },
-      deleteOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deletes an export pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    options?: ExportPipelinesDeleteOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      registryName,
-      exportPipelineName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    registryName: string,
-    nextLink: string,
-    options?: ExportPipelinesListNextOptionalParams
-  ): Promise<ExportPipelinesListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, nextLink, options },
-      listNextOperationSpec
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const listOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/exportPipelines",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ExportPipelineListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/exportPipelines/{exportPipelineName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ExportPipeline
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.exportPipelineName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const createOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/exportPipelines/{exportPipelineName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ExportPipeline
-    },
-    201: {
-      bodyMapper: Mappers.ExportPipeline
-    },
-    202: {
-      bodyMapper: Mappers.ExportPipeline
-    },
-    204: {
-      bodyMapper: Mappers.ExportPipeline
-    }
-  },
-  requestBody: Parameters.exportPipelineCreateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.exportPipelineName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/exportPipelines/{exportPipelineName}",
-  httpMethod: "DELETE",
-  responses: { 200: {}, 201: {}, 202: {}, 204: {} },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.exportPipelineName
-  ],
-  serializer
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ExportPipelineListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.nextLink
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts b/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts
deleted file mode 100644
index 192becc9d6a7..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { ImportPipelines } from "../operationsInterfaces";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers";
-import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
-import {
-  ImportPipeline,
-  ImportPipelinesListNextOptionalParams,
-  ImportPipelinesListOptionalParams,
-  ImportPipelinesListResponse,
-  ImportPipelinesGetOptionalParams,
-  ImportPipelinesGetResponse,
-  ImportPipelinesCreateOptionalParams,
-  ImportPipelinesCreateResponse,
-  ImportPipelinesDeleteOptionalParams,
-  ImportPipelinesListNextResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing ImportPipelines operations. */
-export class ImportPipelinesImpl implements ImportPipelines {
-  private readonly client: ContainerRegistryManagementClientContext;
-
-  /**
-   * Initialize a new instance of the class ImportPipelines class.
-   * @param client Reference to the service client
-   */
-  constructor(client: ContainerRegistryManagementClientContext) {
-    this.client = client;
-  }
-
-  /**
-   * Lists all import pipelines for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ImportPipelinesListOptionalParams
-  ): PagedAsyncIterableIterator<ImportPipeline> {
-    const iter = this.listPagingAll(resourceGroupName, registryName, options);
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, registryName, options);
-      }
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ImportPipelinesListOptionalParams
-  ): AsyncIterableIterator<ImportPipeline[]> {
-    let result = await this._list(resourceGroupName, registryName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        registryName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ImportPipelinesListOptionalParams
-  ): AsyncIterableIterator<ImportPipeline> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      registryName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Lists all import pipelines for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ImportPipelinesListOptionalParams
-  ): Promise<ImportPipelinesListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, options },
-      listOperationSpec
-    );
-  }
-
-  /**
-   * Gets the properties of the import pipeline.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    options?: ImportPipelinesGetOptionalParams
-  ): Promise<ImportPipelinesGetResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, importPipelineName, options },
-      getOperationSpec
-    );
-  }
-
-  /**
-   * Creates an import pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param importPipelineCreateParameters The parameters for creating an import pipeline.
-   * @param options The options parameters.
-   */
-  async beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    importPipelineCreateParameters: ImportPipeline,
-    options?: ImportPipelinesCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ImportPipelinesCreateResponse>,
-      ImportPipelinesCreateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<ImportPipelinesCreateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        importPipelineName,
-        importPipelineCreateParameters,
-        options
-      },
-      createOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Creates an import pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param importPipelineCreateParameters The parameters for creating an import pipeline.
-   * @param options The options parameters.
-   */
-  async beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    importPipelineCreateParameters: ImportPipeline,
-    options?: ImportPipelinesCreateOptionalParams
-  ): Promise<ImportPipelinesCreateResponse> {
-    const poller = await this.beginCreate(
-      resourceGroupName,
-      registryName,
-      importPipelineName,
-      importPipelineCreateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deletes an import pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    options?: ImportPipelinesDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, importPipelineName, options },
-      deleteOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deletes an import pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    options?: ImportPipelinesDeleteOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      registryName,
-      importPipelineName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    registryName: string,
-    nextLink: string,
-    options?: ImportPipelinesListNextOptionalParams
-  ): Promise<ImportPipelinesListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, nextLink, options },
-      listNextOperationSpec
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const listOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/importPipelines",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ImportPipelineListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/importPipelines/{importPipelineName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ImportPipeline
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.importPipelineName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const createOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/importPipelines/{importPipelineName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ImportPipeline
-    },
-    201: {
-      bodyMapper: Mappers.ImportPipeline
-    },
-    202: {
-      bodyMapper: Mappers.ImportPipeline
-    },
-    204: {
-      bodyMapper: Mappers.ImportPipeline
-    }
-  },
-  requestBody: Parameters.importPipelineCreateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.importPipelineName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/importPipelines/{importPipelineName}",
-  httpMethod: "DELETE",
-  responses: { 200: {}, 201: {}, 202: {}, 204: {} },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.importPipelineName
-  ],
-  serializer
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ImportPipelineListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.nextLink
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/index.ts b/sdk/containerregistry/arm-containerregistry/src/operations/index.ts
index 91121ffb11ec..84e48b8a3e83 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/index.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/index.ts
@@ -6,16 +6,10 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-export * from "./connectedRegistries";
-export * from "./exportPipelines";
 export * from "./registries";
-export * from "./importPipelines";
 export * from "./operations";
-export * from "./pipelineRuns";
 export * from "./privateEndpointConnections";
 export * from "./replications";
-export * from "./scopeMaps";
-export * from "./tokens";
 export * from "./webhooks";
 export * from "./agentPools";
 export * from "./runs";
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/operations.ts b/sdk/containerregistry/arm-containerregistry/src/operations/operations.ts
index 31ba8d4e6bf6..4df9d65a6067 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/operations.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/operations.ts
@@ -11,7 +11,7 @@ import { Operations } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import {
   OperationDefinition,
   OperationsListNextOptionalParams,
@@ -23,13 +23,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing Operations operations. */
 export class OperationsImpl implements Operations {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class Operations class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts b/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts
deleted file mode 100644
index 2046fce2e36e..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PipelineRuns } from "../operationsInterfaces";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers";
-import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
-import {
-  PipelineRun,
-  PipelineRunsListNextOptionalParams,
-  PipelineRunsListOptionalParams,
-  PipelineRunsListResponse,
-  PipelineRunsGetOptionalParams,
-  PipelineRunsGetResponse,
-  PipelineRunsCreateOptionalParams,
-  PipelineRunsCreateResponse,
-  PipelineRunsDeleteOptionalParams,
-  PipelineRunsListNextResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing PipelineRuns operations. */
-export class PipelineRunsImpl implements PipelineRuns {
-  private readonly client: ContainerRegistryManagementClientContext;
-
-  /**
-   * Initialize a new instance of the class PipelineRuns class.
-   * @param client Reference to the service client
-   */
-  constructor(client: ContainerRegistryManagementClientContext) {
-    this.client = client;
-  }
-
-  /**
-   * Lists all the pipeline runs for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: PipelineRunsListOptionalParams
-  ): PagedAsyncIterableIterator<PipelineRun> {
-    const iter = this.listPagingAll(resourceGroupName, registryName, options);
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, registryName, options);
-      }
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    registryName: string,
-    options?: PipelineRunsListOptionalParams
-  ): AsyncIterableIterator<PipelineRun[]> {
-    let result = await this._list(resourceGroupName, registryName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        registryName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    registryName: string,
-    options?: PipelineRunsListOptionalParams
-  ): AsyncIterableIterator<PipelineRun> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      registryName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Lists all the pipeline runs for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: PipelineRunsListOptionalParams
-  ): Promise<PipelineRunsListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, options },
-      listOperationSpec
-    );
-  }
-
-  /**
-   * Gets the detailed information for a given pipeline run.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    options?: PipelineRunsGetOptionalParams
-  ): Promise<PipelineRunsGetResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, pipelineRunName, options },
-      getOperationSpec
-    );
-  }
-
-  /**
-   * Creates a pipeline run for a container registry with the specified parameters
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param pipelineRunCreateParameters The parameters for creating a pipeline run.
-   * @param options The options parameters.
-   */
-  async beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    pipelineRunCreateParameters: PipelineRun,
-    options?: PipelineRunsCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<PipelineRunsCreateResponse>,
-      PipelineRunsCreateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<PipelineRunsCreateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        pipelineRunName,
-        pipelineRunCreateParameters,
-        options
-      },
-      createOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Creates a pipeline run for a container registry with the specified parameters
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param pipelineRunCreateParameters The parameters for creating a pipeline run.
-   * @param options The options parameters.
-   */
-  async beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    pipelineRunCreateParameters: PipelineRun,
-    options?: PipelineRunsCreateOptionalParams
-  ): Promise<PipelineRunsCreateResponse> {
-    const poller = await this.beginCreate(
-      resourceGroupName,
-      registryName,
-      pipelineRunName,
-      pipelineRunCreateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deletes a pipeline run from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    options?: PipelineRunsDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, pipelineRunName, options },
-      deleteOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deletes a pipeline run from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    options?: PipelineRunsDeleteOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      registryName,
-      pipelineRunName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    registryName: string,
-    nextLink: string,
-    options?: PipelineRunsListNextOptionalParams
-  ): Promise<PipelineRunsListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, nextLink, options },
-      listNextOperationSpec
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const listOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/pipelineRuns",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.PipelineRunListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/pipelineRuns/{pipelineRunName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.PipelineRun
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.pipelineRunName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const createOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/pipelineRuns/{pipelineRunName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.PipelineRun
-    },
-    201: {
-      bodyMapper: Mappers.PipelineRun
-    },
-    202: {
-      bodyMapper: Mappers.PipelineRun
-    },
-    204: {
-      bodyMapper: Mappers.PipelineRun
-    }
-  },
-  requestBody: Parameters.pipelineRunCreateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.pipelineRunName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/pipelineRuns/{pipelineRunName}",
-  httpMethod: "DELETE",
-  responses: { 200: {}, 201: {}, 202: {}, 204: {} },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.pipelineRunName
-  ],
-  serializer
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.PipelineRunListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.nextLink
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts b/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts
index f26166244cd8..c385258da843 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts
@@ -11,7 +11,7 @@ import { PrivateEndpointConnections } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -31,13 +31,13 @@ import {
 /** Class containing PrivateEndpointConnections operations. */
 export class PrivateEndpointConnectionsImpl
   implements PrivateEndpointConnections {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class PrivateEndpointConnections class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -420,7 +420,7 @@ const createOrUpdateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.privateEndpointConnectionName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts b/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts
index aea570ee126a..75404c49400c 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts
@@ -11,7 +11,7 @@ import { Registries } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -41,14 +41,13 @@ import {
   RegistriesListUsagesOptionalParams,
   RegistriesListUsagesResponse,
   RegistriesListPrivateLinkResourcesResponse,
+  RegistriesGetPrivateLinkResourceOptionalParams,
+  RegistriesGetPrivateLinkResourceResponse,
   RegistriesListCredentialsOptionalParams,
   RegistriesListCredentialsResponse,
   RegenerateCredentialParameters,
   RegistriesRegenerateCredentialOptionalParams,
   RegistriesRegenerateCredentialResponse,
-  GenerateCredentialsParameters,
-  RegistriesGenerateCredentialsOptionalParams,
-  RegistriesGenerateCredentialsResponse,
   RunRequestUnion,
   RegistriesScheduleRunOptionalParams,
   RegistriesScheduleRunResponse,
@@ -62,13 +61,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing Registries operations. */
 export class RegistriesImpl implements Registries {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class Registries class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -675,6 +674,25 @@ export class RegistriesImpl implements Registries {
     );
   }
 
+  /**
+   * Gets a private link resource by a specified group name for a container registry.
+   * @param resourceGroupName The name of the resource group to which the container registry belongs.
+   * @param registryName The name of the container registry.
+   * @param groupName The name of the private link resource.
+   * @param options The options parameters.
+   */
+  getPrivateLinkResource(
+    resourceGroupName: string,
+    registryName: string,
+    groupName: string,
+    options?: RegistriesGetPrivateLinkResourceOptionalParams
+  ): Promise<RegistriesGetPrivateLinkResourceResponse> {
+    return this.client.sendOperationRequest(
+      { resourceGroupName, registryName, groupName, options },
+      getPrivateLinkResourceOperationSpec
+    );
+  }
+
   /**
    * Lists the login credentials for the specified container registry.
    * @param resourceGroupName The name of the resource group to which the container registry belongs.
@@ -717,101 +735,6 @@ export class RegistriesImpl implements Registries {
     );
   }
 
-  /**
-   * Generate keys for a token of a specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param generateCredentialsParameters The parameters for generating credentials.
-   * @param options The options parameters.
-   */
-  async beginGenerateCredentials(
-    resourceGroupName: string,
-    registryName: string,
-    generateCredentialsParameters: GenerateCredentialsParameters,
-    options?: RegistriesGenerateCredentialsOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<RegistriesGenerateCredentialsResponse>,
-      RegistriesGenerateCredentialsResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<RegistriesGenerateCredentialsResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        generateCredentialsParameters,
-        options
-      },
-      generateCredentialsOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Generate keys for a token of a specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param generateCredentialsParameters The parameters for generating credentials.
-   * @param options The options parameters.
-   */
-  async beginGenerateCredentialsAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    generateCredentialsParameters: GenerateCredentialsParameters,
-    options?: RegistriesGenerateCredentialsOptionalParams
-  ): Promise<RegistriesGenerateCredentialsResponse> {
-    const poller = await this.beginGenerateCredentials(
-      resourceGroupName,
-      registryName,
-      generateCredentialsParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
   /**
    * Schedules a new run based on the request parameters and add it to the run queue.
    * @param resourceGroupName The name of the resource group to which the container registry belongs.
@@ -1003,7 +926,7 @@ const checkNameAvailabilityOperationSpec: coreClient.OperationSpec = {
   requestBody: Parameters.registryNameCheckRequest,
   queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.subscriptionId],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -1084,7 +1007,7 @@ const createOperationSpec: coreClient.OperationSpec = {
     Parameters.resourceGroupName,
     Parameters.registryName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -1128,7 +1051,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.resourceGroupName,
     Parameters.registryName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -1170,13 +1093,16 @@ const listPrivateLinkResourcesOperationSpec: coreClient.OperationSpec = {
   headerParameters: [Parameters.accept],
   serializer
 };
-const listCredentialsOperationSpec: coreClient.OperationSpec = {
+const getPrivateLinkResourceOperationSpec: coreClient.OperationSpec = {
   path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/listCredentials",
-  httpMethod: "POST",
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/privateLinkResources/{groupName}",
+  httpMethod: "GET",
   responses: {
     200: {
-      bodyMapper: Mappers.RegistryListCredentialsResult
+      bodyMapper: Mappers.PrivateLinkResource
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   queryParameters: [Parameters.apiVersion],
@@ -1184,21 +1110,21 @@ const listCredentialsOperationSpec: coreClient.OperationSpec = {
     Parameters.$host,
     Parameters.subscriptionId,
     Parameters.resourceGroupName,
-    Parameters.registryName
+    Parameters.registryName,
+    Parameters.groupName
   ],
   headerParameters: [Parameters.accept],
   serializer
 };
-const regenerateCredentialOperationSpec: coreClient.OperationSpec = {
+const listCredentialsOperationSpec: coreClient.OperationSpec = {
   path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/regenerateCredential",
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/listCredentials",
   httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.RegistryListCredentialsResult
     }
   },
-  requestBody: Parameters.regenerateCredentialParameters,
   queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
@@ -1206,29 +1132,19 @@ const regenerateCredentialOperationSpec: coreClient.OperationSpec = {
     Parameters.resourceGroupName,
     Parameters.registryName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
+  headerParameters: [Parameters.accept],
   serializer
 };
-const generateCredentialsOperationSpec: coreClient.OperationSpec = {
+const regenerateCredentialOperationSpec: coreClient.OperationSpec = {
   path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/generateCredentials",
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/regenerateCredential",
   httpMethod: "POST",
   responses: {
     200: {
-      bodyMapper: Mappers.GenerateCredentialsResult
-    },
-    201: {
-      bodyMapper: Mappers.GenerateCredentialsResult
-    },
-    202: {
-      bodyMapper: Mappers.GenerateCredentialsResult
-    },
-    204: {
-      bodyMapper: Mappers.GenerateCredentialsResult
+      bodyMapper: Mappers.RegistryListCredentialsResult
     }
   },
-  requestBody: Parameters.generateCredentialsParameters,
+  requestBody: Parameters.regenerateCredentialParameters,
   queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
@@ -1236,7 +1152,7 @@ const generateCredentialsOperationSpec: coreClient.OperationSpec = {
     Parameters.resourceGroupName,
     Parameters.registryName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -1269,7 +1185,7 @@ const scheduleRunOperationSpec: coreClient.OperationSpec = {
     Parameters.resourceGroupName,
     Parameters.registryName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts b/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts
index 984a85a77fe0..a35afe55ae8e 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts
@@ -11,7 +11,7 @@ import { Replications } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -33,13 +33,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing Replications operations. */
 export class ReplicationsImpl implements Replications {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class Replications class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -513,7 +513,7 @@ const createOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.replicationName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -559,7 +559,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.replicationName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts b/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts
index d594f1dc0ae4..9a30b71d225f 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts
@@ -11,7 +11,7 @@ import { Runs } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -33,13 +33,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing Runs operations. */
 export class RunsImpl implements Runs {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class Runs class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -368,7 +368,7 @@ const listOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  queryParameters: [Parameters.filter, Parameters.apiVersion1, Parameters.top],
+  queryParameters: [Parameters.apiVersion1, Parameters.filter, Parameters.top],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -431,7 +431,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.runId
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -493,7 +493,7 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  queryParameters: [Parameters.filter, Parameters.apiVersion1, Parameters.top],
+  queryParameters: [Parameters.apiVersion1, Parameters.filter, Parameters.top],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts b/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts
deleted file mode 100644
index 41b6ca6e99e6..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts
+++ /dev/null
@@ -1,584 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { ScopeMaps } from "../operationsInterfaces";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers";
-import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
-import {
-  ScopeMap,
-  ScopeMapsListNextOptionalParams,
-  ScopeMapsListOptionalParams,
-  ScopeMapsListResponse,
-  ScopeMapsGetOptionalParams,
-  ScopeMapsGetResponse,
-  ScopeMapsCreateOptionalParams,
-  ScopeMapsCreateResponse,
-  ScopeMapsDeleteOptionalParams,
-  ScopeMapUpdateParameters,
-  ScopeMapsUpdateOptionalParams,
-  ScopeMapsUpdateResponse,
-  ScopeMapsListNextResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing ScopeMaps operations. */
-export class ScopeMapsImpl implements ScopeMaps {
-  private readonly client: ContainerRegistryManagementClientContext;
-
-  /**
-   * Initialize a new instance of the class ScopeMaps class.
-   * @param client Reference to the service client
-   */
-  constructor(client: ContainerRegistryManagementClientContext) {
-    this.client = client;
-  }
-
-  /**
-   * Lists all the scope maps for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ScopeMapsListOptionalParams
-  ): PagedAsyncIterableIterator<ScopeMap> {
-    const iter = this.listPagingAll(resourceGroupName, registryName, options);
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, registryName, options);
-      }
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ScopeMapsListOptionalParams
-  ): AsyncIterableIterator<ScopeMap[]> {
-    let result = await this._list(resourceGroupName, registryName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        registryName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ScopeMapsListOptionalParams
-  ): AsyncIterableIterator<ScopeMap> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      registryName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Lists all the scope maps for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ScopeMapsListOptionalParams
-  ): Promise<ScopeMapsListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, options },
-      listOperationSpec
-    );
-  }
-
-  /**
-   * Gets the properties of the specified scope map.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    options?: ScopeMapsGetOptionalParams
-  ): Promise<ScopeMapsGetResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, scopeMapName, options },
-      getOperationSpec
-    );
-  }
-
-  /**
-   * Creates a scope map for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapCreateParameters The parameters for creating a scope map.
-   * @param options The options parameters.
-   */
-  async beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapCreateParameters: ScopeMap,
-    options?: ScopeMapsCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ScopeMapsCreateResponse>,
-      ScopeMapsCreateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<ScopeMapsCreateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        scopeMapName,
-        scopeMapCreateParameters,
-        options
-      },
-      createOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Creates a scope map for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapCreateParameters The parameters for creating a scope map.
-   * @param options The options parameters.
-   */
-  async beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapCreateParameters: ScopeMap,
-    options?: ScopeMapsCreateOptionalParams
-  ): Promise<ScopeMapsCreateResponse> {
-    const poller = await this.beginCreate(
-      resourceGroupName,
-      registryName,
-      scopeMapName,
-      scopeMapCreateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deletes a scope map from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    options?: ScopeMapsDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, scopeMapName, options },
-      deleteOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deletes a scope map from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    options?: ScopeMapsDeleteOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      registryName,
-      scopeMapName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Updates a scope map with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapUpdateParameters The parameters for updating a scope map.
-   * @param options The options parameters.
-   */
-  async beginUpdate(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapUpdateParameters: ScopeMapUpdateParameters,
-    options?: ScopeMapsUpdateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ScopeMapsUpdateResponse>,
-      ScopeMapsUpdateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<ScopeMapsUpdateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        scopeMapName,
-        scopeMapUpdateParameters,
-        options
-      },
-      updateOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Updates a scope map with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapUpdateParameters The parameters for updating a scope map.
-   * @param options The options parameters.
-   */
-  async beginUpdateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapUpdateParameters: ScopeMapUpdateParameters,
-    options?: ScopeMapsUpdateOptionalParams
-  ): Promise<ScopeMapsUpdateResponse> {
-    const poller = await this.beginUpdate(
-      resourceGroupName,
-      registryName,
-      scopeMapName,
-      scopeMapUpdateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    registryName: string,
-    nextLink: string,
-    options?: ScopeMapsListNextOptionalParams
-  ): Promise<ScopeMapsListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, nextLink, options },
-      listNextOperationSpec
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const listOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/scopeMaps",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ScopeMapListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/scopeMaps/{scopeMapName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ScopeMap
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.scopeMapName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const createOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/scopeMaps/{scopeMapName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ScopeMap
-    },
-    201: {
-      bodyMapper: Mappers.ScopeMap
-    },
-    202: {
-      bodyMapper: Mappers.ScopeMap
-    },
-    204: {
-      bodyMapper: Mappers.ScopeMap
-    }
-  },
-  requestBody: Parameters.scopeMapCreateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.scopeMapName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/scopeMaps/{scopeMapName}",
-  httpMethod: "DELETE",
-  responses: { 200: {}, 201: {}, 202: {}, 204: {} },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.scopeMapName
-  ],
-  serializer
-};
-const updateOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/scopeMaps/{scopeMapName}",
-  httpMethod: "PATCH",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ScopeMap
-    },
-    201: {
-      bodyMapper: Mappers.ScopeMap
-    },
-    202: {
-      bodyMapper: Mappers.ScopeMap
-    },
-    204: {
-      bodyMapper: Mappers.ScopeMap
-    }
-  },
-  requestBody: Parameters.scopeMapUpdateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.scopeMapName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.ScopeMapListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.nextLink
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts b/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts
index f5c397c1bb31..933459582441 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts
@@ -11,7 +11,7 @@ import { TaskRuns } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -35,13 +35,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing TaskRuns operations. */
 export class TaskRunsImpl implements TaskRuns {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class TaskRuns class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -515,7 +515,7 @@ const createOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.taskRunName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -573,7 +573,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.taskRunName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts b/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts
index d780b0282a90..66c65e9f498f 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts
@@ -11,7 +11,7 @@ import { Tasks } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -35,13 +35,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing Tasks operations. */
 export class TasksImpl implements Tasks {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class Tasks class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -537,7 +537,7 @@ const createOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.taskName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -595,7 +595,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.taskName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts b/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts
deleted file mode 100644
index 6ef3d843bf99..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { Tokens } from "../operationsInterfaces";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers";
-import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
-import {
-  Token,
-  TokensListNextOptionalParams,
-  TokensListOptionalParams,
-  TokensListResponse,
-  TokensGetOptionalParams,
-  TokensGetResponse,
-  TokensCreateOptionalParams,
-  TokensCreateResponse,
-  TokensDeleteOptionalParams,
-  TokenUpdateParameters,
-  TokensUpdateOptionalParams,
-  TokensUpdateResponse,
-  TokensListNextResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing Tokens operations. */
-export class TokensImpl implements Tokens {
-  private readonly client: ContainerRegistryManagementClientContext;
-
-  /**
-   * Initialize a new instance of the class Tokens class.
-   * @param client Reference to the service client
-   */
-  constructor(client: ContainerRegistryManagementClientContext) {
-    this.client = client;
-  }
-
-  /**
-   * Lists all the tokens for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: TokensListOptionalParams
-  ): PagedAsyncIterableIterator<Token> {
-    const iter = this.listPagingAll(resourceGroupName, registryName, options);
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, registryName, options);
-      }
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    registryName: string,
-    options?: TokensListOptionalParams
-  ): AsyncIterableIterator<Token[]> {
-    let result = await this._list(resourceGroupName, registryName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        registryName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    registryName: string,
-    options?: TokensListOptionalParams
-  ): AsyncIterableIterator<Token> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      registryName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Lists all the tokens for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: TokensListOptionalParams
-  ): Promise<TokensListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, options },
-      listOperationSpec
-    );
-  }
-
-  /**
-   * Gets the properties of the specified token.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    options?: TokensGetOptionalParams
-  ): Promise<TokensGetResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, tokenName, options },
-      getOperationSpec
-    );
-  }
-
-  /**
-   * Creates a token for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenCreateParameters The parameters for creating a token.
-   * @param options The options parameters.
-   */
-  async beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenCreateParameters: Token,
-    options?: TokensCreateOptionalParams
-  ): Promise<
-    PollerLike<PollOperationState<TokensCreateResponse>, TokensCreateResponse>
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<TokensCreateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        tokenName,
-        tokenCreateParameters,
-        options
-      },
-      createOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Creates a token for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenCreateParameters The parameters for creating a token.
-   * @param options The options parameters.
-   */
-  async beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenCreateParameters: Token,
-    options?: TokensCreateOptionalParams
-  ): Promise<TokensCreateResponse> {
-    const poller = await this.beginCreate(
-      resourceGroupName,
-      registryName,
-      tokenName,
-      tokenCreateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Deletes a token from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    options?: TokensDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, registryName, tokenName, options },
-      deleteOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Deletes a token from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    options?: TokensDeleteOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      registryName,
-      tokenName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Updates a token with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenUpdateParameters The parameters for updating a token.
-   * @param options The options parameters.
-   */
-  async beginUpdate(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenUpdateParameters: TokenUpdateParameters,
-    options?: TokensUpdateOptionalParams
-  ): Promise<
-    PollerLike<PollOperationState<TokensUpdateResponse>, TokensUpdateResponse>
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<TokensUpdateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      {
-        resourceGroupName,
-        registryName,
-        tokenName,
-        tokenUpdateParameters,
-        options
-      },
-      updateOperationSpec
-    );
-    return new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-  }
-
-  /**
-   * Updates a token with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenUpdateParameters The parameters for updating a token.
-   * @param options The options parameters.
-   */
-  async beginUpdateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenUpdateParameters: TokenUpdateParameters,
-    options?: TokensUpdateOptionalParams
-  ): Promise<TokensUpdateResponse> {
-    const poller = await this.beginUpdate(
-      resourceGroupName,
-      registryName,
-      tokenName,
-      tokenUpdateParameters,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    registryName: string,
-    nextLink: string,
-    options?: TokensListNextOptionalParams
-  ): Promise<TokensListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, registryName, nextLink, options },
-      listNextOperationSpec
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const listOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/tokens",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.TokenListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/tokens/{tokenName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.Token
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.tokenName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
-const createOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/tokens/{tokenName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.Token
-    },
-    201: {
-      bodyMapper: Mappers.Token
-    },
-    202: {
-      bodyMapper: Mappers.Token
-    },
-    204: {
-      bodyMapper: Mappers.Token
-    }
-  },
-  requestBody: Parameters.tokenCreateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.tokenName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/tokens/{tokenName}",
-  httpMethod: "DELETE",
-  responses: { 200: {}, 201: {}, 202: {}, 204: {} },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.tokenName
-  ],
-  serializer
-};
-const updateOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerRegistry/registries/{registryName}/tokens/{tokenName}",
-  httpMethod: "PATCH",
-  responses: {
-    200: {
-      bodyMapper: Mappers.Token
-    },
-    201: {
-      bodyMapper: Mappers.Token
-    },
-    202: {
-      bodyMapper: Mappers.Token
-    },
-    204: {
-      bodyMapper: Mappers.Token
-    }
-  },
-  requestBody: Parameters.tokenUpdateParameters,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.tokenName
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.TokenListResult
-    }
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.registryName,
-    Parameters.nextLink
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts b/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts
index ee57496b23f8..cba20e5b2872 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts
@@ -11,7 +11,7 @@ import { Webhooks } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { ContainerRegistryManagementClientContext } from "../containerRegistryManagementClientContext";
+import { ContainerRegistryManagementClient } from "../containerRegistryManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -43,13 +43,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing Webhooks operations. */
 export class WebhooksImpl implements Webhooks {
-  private readonly client: ContainerRegistryManagementClientContext;
+  private readonly client: ContainerRegistryManagementClient;
 
   /**
    * Initialize a new instance of the class Webhooks class.
    * @param client Reference to the service client
    */
-  constructor(client: ContainerRegistryManagementClientContext) {
+  constructor(client: ContainerRegistryManagementClient) {
     this.client = client;
   }
 
@@ -681,7 +681,7 @@ const createOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.webhookName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
@@ -727,7 +727,7 @@ const updateOperationSpec: coreClient.OperationSpec = {
     Parameters.registryName,
     Parameters.webhookName
   ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
+  headerParameters: [Parameters.contentType, Parameters.accept],
   mediaType: "json",
   serializer
 };
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/connectedRegistries.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/connectedRegistries.ts
deleted file mode 100644
index e4e3d805a9e6..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/connectedRegistries.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import {
-  ConnectedRegistry,
-  ConnectedRegistriesListOptionalParams,
-  ConnectedRegistriesGetOptionalParams,
-  ConnectedRegistriesGetResponse,
-  ConnectedRegistriesCreateOptionalParams,
-  ConnectedRegistriesCreateResponse,
-  ConnectedRegistriesDeleteOptionalParams,
-  ConnectedRegistryUpdateParameters,
-  ConnectedRegistriesUpdateOptionalParams,
-  ConnectedRegistriesUpdateResponse,
-  ConnectedRegistriesDeactivateOptionalParams
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a ConnectedRegistries. */
-export interface ConnectedRegistries {
-  /**
-   * Lists all connected registries for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ConnectedRegistriesListOptionalParams
-  ): PagedAsyncIterableIterator<ConnectedRegistry>;
-  /**
-   * Gets the properties of the connected registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesGetOptionalParams
-  ): Promise<ConnectedRegistriesGetResponse>;
-  /**
-   * Creates a connected registry for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryCreateParameters The parameters for creating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryCreateParameters: ConnectedRegistry,
-    options?: ConnectedRegistriesCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ConnectedRegistriesCreateResponse>,
-      ConnectedRegistriesCreateResponse
-    >
-  >;
-  /**
-   * Creates a connected registry for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryCreateParameters The parameters for creating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryCreateParameters: ConnectedRegistry,
-    options?: ConnectedRegistriesCreateOptionalParams
-  ): Promise<ConnectedRegistriesCreateResponse>;
-  /**
-   * Deletes a connected registry from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deletes a connected registry from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeleteOptionalParams
-  ): Promise<void>;
-  /**
-   * Updates a connected registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryUpdateParameters The parameters for updating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  beginUpdate(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryUpdateParameters: ConnectedRegistryUpdateParameters,
-    options?: ConnectedRegistriesUpdateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ConnectedRegistriesUpdateResponse>,
-      ConnectedRegistriesUpdateResponse
-    >
-  >;
-  /**
-   * Updates a connected registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param connectedRegistryUpdateParameters The parameters for updating a connectedRegistry.
-   * @param options The options parameters.
-   */
-  beginUpdateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    connectedRegistryUpdateParameters: ConnectedRegistryUpdateParameters,
-    options?: ConnectedRegistriesUpdateOptionalParams
-  ): Promise<ConnectedRegistriesUpdateResponse>;
-  /**
-   * Deactivates the connected registry instance.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  beginDeactivate(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeactivateOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deactivates the connected registry instance.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param connectedRegistryName The name of the connected registry.
-   * @param options The options parameters.
-   */
-  beginDeactivateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    connectedRegistryName: string,
-    options?: ConnectedRegistriesDeactivateOptionalParams
-  ): Promise<void>;
-}
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/exportPipelines.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/exportPipelines.ts
deleted file mode 100644
index 10a274453990..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/exportPipelines.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import {
-  ExportPipeline,
-  ExportPipelinesListOptionalParams,
-  ExportPipelinesGetOptionalParams,
-  ExportPipelinesGetResponse,
-  ExportPipelinesCreateOptionalParams,
-  ExportPipelinesCreateResponse,
-  ExportPipelinesDeleteOptionalParams
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a ExportPipelines. */
-export interface ExportPipelines {
-  /**
-   * Lists all export pipelines for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ExportPipelinesListOptionalParams
-  ): PagedAsyncIterableIterator<ExportPipeline>;
-  /**
-   * Gets the properties of the export pipeline.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    options?: ExportPipelinesGetOptionalParams
-  ): Promise<ExportPipelinesGetResponse>;
-  /**
-   * Creates an export pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param exportPipelineCreateParameters The parameters for creating an export pipeline.
-   * @param options The options parameters.
-   */
-  beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    exportPipelineCreateParameters: ExportPipeline,
-    options?: ExportPipelinesCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ExportPipelinesCreateResponse>,
-      ExportPipelinesCreateResponse
-    >
-  >;
-  /**
-   * Creates an export pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param exportPipelineCreateParameters The parameters for creating an export pipeline.
-   * @param options The options parameters.
-   */
-  beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    exportPipelineCreateParameters: ExportPipeline,
-    options?: ExportPipelinesCreateOptionalParams
-  ): Promise<ExportPipelinesCreateResponse>;
-  /**
-   * Deletes an export pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    options?: ExportPipelinesDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deletes an export pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param exportPipelineName The name of the export pipeline.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    exportPipelineName: string,
-    options?: ExportPipelinesDeleteOptionalParams
-  ): Promise<void>;
-}
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/importPipelines.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/importPipelines.ts
deleted file mode 100644
index 4bba6e44007d..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/importPipelines.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import {
-  ImportPipeline,
-  ImportPipelinesListOptionalParams,
-  ImportPipelinesGetOptionalParams,
-  ImportPipelinesGetResponse,
-  ImportPipelinesCreateOptionalParams,
-  ImportPipelinesCreateResponse,
-  ImportPipelinesDeleteOptionalParams
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a ImportPipelines. */
-export interface ImportPipelines {
-  /**
-   * Lists all import pipelines for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ImportPipelinesListOptionalParams
-  ): PagedAsyncIterableIterator<ImportPipeline>;
-  /**
-   * Gets the properties of the import pipeline.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    options?: ImportPipelinesGetOptionalParams
-  ): Promise<ImportPipelinesGetResponse>;
-  /**
-   * Creates an import pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param importPipelineCreateParameters The parameters for creating an import pipeline.
-   * @param options The options parameters.
-   */
-  beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    importPipelineCreateParameters: ImportPipeline,
-    options?: ImportPipelinesCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ImportPipelinesCreateResponse>,
-      ImportPipelinesCreateResponse
-    >
-  >;
-  /**
-   * Creates an import pipeline for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param importPipelineCreateParameters The parameters for creating an import pipeline.
-   * @param options The options parameters.
-   */
-  beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    importPipelineCreateParameters: ImportPipeline,
-    options?: ImportPipelinesCreateOptionalParams
-  ): Promise<ImportPipelinesCreateResponse>;
-  /**
-   * Deletes an import pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    options?: ImportPipelinesDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deletes an import pipeline from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param importPipelineName The name of the import pipeline.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    importPipelineName: string,
-    options?: ImportPipelinesDeleteOptionalParams
-  ): Promise<void>;
-}
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/index.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/index.ts
index 91121ffb11ec..84e48b8a3e83 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/index.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/index.ts
@@ -6,16 +6,10 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-export * from "./connectedRegistries";
-export * from "./exportPipelines";
 export * from "./registries";
-export * from "./importPipelines";
 export * from "./operations";
-export * from "./pipelineRuns";
 export * from "./privateEndpointConnections";
 export * from "./replications";
-export * from "./scopeMaps";
-export * from "./tokens";
 export * from "./webhooks";
 export * from "./agentPools";
 export * from "./runs";
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/pipelineRuns.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/pipelineRuns.ts
deleted file mode 100644
index cbfd4e6fc119..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/pipelineRuns.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import {
-  PipelineRun,
-  PipelineRunsListOptionalParams,
-  PipelineRunsGetOptionalParams,
-  PipelineRunsGetResponse,
-  PipelineRunsCreateOptionalParams,
-  PipelineRunsCreateResponse,
-  PipelineRunsDeleteOptionalParams
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a PipelineRuns. */
-export interface PipelineRuns {
-  /**
-   * Lists all the pipeline runs for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: PipelineRunsListOptionalParams
-  ): PagedAsyncIterableIterator<PipelineRun>;
-  /**
-   * Gets the detailed information for a given pipeline run.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    options?: PipelineRunsGetOptionalParams
-  ): Promise<PipelineRunsGetResponse>;
-  /**
-   * Creates a pipeline run for a container registry with the specified parameters
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param pipelineRunCreateParameters The parameters for creating a pipeline run.
-   * @param options The options parameters.
-   */
-  beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    pipelineRunCreateParameters: PipelineRun,
-    options?: PipelineRunsCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<PipelineRunsCreateResponse>,
-      PipelineRunsCreateResponse
-    >
-  >;
-  /**
-   * Creates a pipeline run for a container registry with the specified parameters
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param pipelineRunCreateParameters The parameters for creating a pipeline run.
-   * @param options The options parameters.
-   */
-  beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    pipelineRunCreateParameters: PipelineRun,
-    options?: PipelineRunsCreateOptionalParams
-  ): Promise<PipelineRunsCreateResponse>;
-  /**
-   * Deletes a pipeline run from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    options?: PipelineRunsDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deletes a pipeline run from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param pipelineRunName The name of the pipeline run.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    pipelineRunName: string,
-    options?: PipelineRunsDeleteOptionalParams
-  ): Promise<void>;
-}
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/registries.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/registries.ts
index 81e5a28093ba..8b7529487a11 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/registries.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/registries.ts
@@ -29,14 +29,13 @@ import {
   RegistriesUpdateResponse,
   RegistriesListUsagesOptionalParams,
   RegistriesListUsagesResponse,
+  RegistriesGetPrivateLinkResourceOptionalParams,
+  RegistriesGetPrivateLinkResourceResponse,
   RegistriesListCredentialsOptionalParams,
   RegistriesListCredentialsResponse,
   RegenerateCredentialParameters,
   RegistriesRegenerateCredentialOptionalParams,
   RegistriesRegenerateCredentialResponse,
-  GenerateCredentialsParameters,
-  RegistriesGenerateCredentialsOptionalParams,
-  RegistriesGenerateCredentialsResponse,
   RunRequestUnion,
   RegistriesScheduleRunOptionalParams,
   RegistriesScheduleRunResponse,
@@ -216,6 +215,19 @@ export interface Registries {
     registryName: string,
     options?: RegistriesListUsagesOptionalParams
   ): Promise<RegistriesListUsagesResponse>;
+  /**
+   * Gets a private link resource by a specified group name for a container registry.
+   * @param resourceGroupName The name of the resource group to which the container registry belongs.
+   * @param registryName The name of the container registry.
+   * @param groupName The name of the private link resource.
+   * @param options The options parameters.
+   */
+  getPrivateLinkResource(
+    resourceGroupName: string,
+    registryName: string,
+    groupName: string,
+    options?: RegistriesGetPrivateLinkResourceOptionalParams
+  ): Promise<RegistriesGetPrivateLinkResourceResponse>;
   /**
    * Lists the login credentials for the specified container registry.
    * @param resourceGroupName The name of the resource group to which the container registry belongs.
@@ -241,37 +253,6 @@ export interface Registries {
     regenerateCredentialParameters: RegenerateCredentialParameters,
     options?: RegistriesRegenerateCredentialOptionalParams
   ): Promise<RegistriesRegenerateCredentialResponse>;
-  /**
-   * Generate keys for a token of a specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param generateCredentialsParameters The parameters for generating credentials.
-   * @param options The options parameters.
-   */
-  beginGenerateCredentials(
-    resourceGroupName: string,
-    registryName: string,
-    generateCredentialsParameters: GenerateCredentialsParameters,
-    options?: RegistriesGenerateCredentialsOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<RegistriesGenerateCredentialsResponse>,
-      RegistriesGenerateCredentialsResponse
-    >
-  >;
-  /**
-   * Generate keys for a token of a specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param generateCredentialsParameters The parameters for generating credentials.
-   * @param options The options parameters.
-   */
-  beginGenerateCredentialsAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    generateCredentialsParameters: GenerateCredentialsParameters,
-    options?: RegistriesGenerateCredentialsOptionalParams
-  ): Promise<RegistriesGenerateCredentialsResponse>;
   /**
    * Schedules a new run based on the request parameters and add it to the run queue.
    * @param resourceGroupName The name of the resource group to which the container registry belongs.
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/scopeMaps.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/scopeMaps.ts
deleted file mode 100644
index c8d7e91c41d0..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/scopeMaps.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import {
-  ScopeMap,
-  ScopeMapsListOptionalParams,
-  ScopeMapsGetOptionalParams,
-  ScopeMapsGetResponse,
-  ScopeMapsCreateOptionalParams,
-  ScopeMapsCreateResponse,
-  ScopeMapsDeleteOptionalParams,
-  ScopeMapUpdateParameters,
-  ScopeMapsUpdateOptionalParams,
-  ScopeMapsUpdateResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a ScopeMaps. */
-export interface ScopeMaps {
-  /**
-   * Lists all the scope maps for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: ScopeMapsListOptionalParams
-  ): PagedAsyncIterableIterator<ScopeMap>;
-  /**
-   * Gets the properties of the specified scope map.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    options?: ScopeMapsGetOptionalParams
-  ): Promise<ScopeMapsGetResponse>;
-  /**
-   * Creates a scope map for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapCreateParameters The parameters for creating a scope map.
-   * @param options The options parameters.
-   */
-  beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapCreateParameters: ScopeMap,
-    options?: ScopeMapsCreateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ScopeMapsCreateResponse>,
-      ScopeMapsCreateResponse
-    >
-  >;
-  /**
-   * Creates a scope map for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapCreateParameters The parameters for creating a scope map.
-   * @param options The options parameters.
-   */
-  beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapCreateParameters: ScopeMap,
-    options?: ScopeMapsCreateOptionalParams
-  ): Promise<ScopeMapsCreateResponse>;
-  /**
-   * Deletes a scope map from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    options?: ScopeMapsDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deletes a scope map from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    options?: ScopeMapsDeleteOptionalParams
-  ): Promise<void>;
-  /**
-   * Updates a scope map with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapUpdateParameters The parameters for updating a scope map.
-   * @param options The options parameters.
-   */
-  beginUpdate(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapUpdateParameters: ScopeMapUpdateParameters,
-    options?: ScopeMapsUpdateOptionalParams
-  ): Promise<
-    PollerLike<
-      PollOperationState<ScopeMapsUpdateResponse>,
-      ScopeMapsUpdateResponse
-    >
-  >;
-  /**
-   * Updates a scope map with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param scopeMapName The name of the scope map.
-   * @param scopeMapUpdateParameters The parameters for updating a scope map.
-   * @param options The options parameters.
-   */
-  beginUpdateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    scopeMapName: string,
-    scopeMapUpdateParameters: ScopeMapUpdateParameters,
-    options?: ScopeMapsUpdateOptionalParams
-  ): Promise<ScopeMapsUpdateResponse>;
-}
diff --git a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/tokens.ts b/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/tokens.ts
deleted file mode 100644
index 3842697d99b3..000000000000
--- a/sdk/containerregistry/arm-containerregistry/src/operationsInterfaces/tokens.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
-import {
-  Token,
-  TokensListOptionalParams,
-  TokensGetOptionalParams,
-  TokensGetResponse,
-  TokensCreateOptionalParams,
-  TokensCreateResponse,
-  TokensDeleteOptionalParams,
-  TokenUpdateParameters,
-  TokensUpdateOptionalParams,
-  TokensUpdateResponse
-} from "../models";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a Tokens. */
-export interface Tokens {
-  /**
-   * Lists all the tokens for the specified container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    registryName: string,
-    options?: TokensListOptionalParams
-  ): PagedAsyncIterableIterator<Token>;
-  /**
-   * Gets the properties of the specified token.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    options?: TokensGetOptionalParams
-  ): Promise<TokensGetResponse>;
-  /**
-   * Creates a token for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenCreateParameters The parameters for creating a token.
-   * @param options The options parameters.
-   */
-  beginCreate(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenCreateParameters: Token,
-    options?: TokensCreateOptionalParams
-  ): Promise<
-    PollerLike<PollOperationState<TokensCreateResponse>, TokensCreateResponse>
-  >;
-  /**
-   * Creates a token for a container registry with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenCreateParameters The parameters for creating a token.
-   * @param options The options parameters.
-   */
-  beginCreateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenCreateParameters: Token,
-    options?: TokensCreateOptionalParams
-  ): Promise<TokensCreateResponse>;
-  /**
-   * Deletes a token from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    options?: TokensDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Deletes a token from a container registry.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    options?: TokensDeleteOptionalParams
-  ): Promise<void>;
-  /**
-   * Updates a token with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenUpdateParameters The parameters for updating a token.
-   * @param options The options parameters.
-   */
-  beginUpdate(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenUpdateParameters: TokenUpdateParameters,
-    options?: TokensUpdateOptionalParams
-  ): Promise<
-    PollerLike<PollOperationState<TokensUpdateResponse>, TokensUpdateResponse>
-  >;
-  /**
-   * Updates a token with the specified parameters.
-   * @param resourceGroupName The name of the resource group to which the container registry belongs.
-   * @param registryName The name of the container registry.
-   * @param tokenName The name of the token.
-   * @param tokenUpdateParameters The parameters for updating a token.
-   * @param options The options parameters.
-   */
-  beginUpdateAndWait(
-    resourceGroupName: string,
-    registryName: string,
-    tokenName: string,
-    tokenUpdateParameters: TokenUpdateParameters,
-    options?: TokensUpdateOptionalParams
-  ): Promise<TokensUpdateResponse>;
-}
diff --git a/sdk/containerregistry/arm-containerregistry/test/containerregistry_examples.ts b/sdk/containerregistry/arm-containerregistry/test/containerregistry_examples.ts
deleted file mode 100644
index a02cec510526..000000000000
--- a/sdk/containerregistry/arm-containerregistry/test/containerregistry_examples.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import {
-  env,
-  record,
-  RecorderEnvironmentSetup,
-  Recorder,
-  delay,
-  isPlaybackMode
-} from "@azure-tools/test-recorder";
-import * as assert from "assert";
-import { ClientSecretCredential } from "@azure/identity";
-import { ContainerRegistryManagementClient } from "../src/containerRegistryManagementClient";
-
-const recorderEnvSetup: RecorderEnvironmentSetup = {
-  replaceableVariables: {
-    AZURE_CLIENT_ID: "azure_client_id",
-    AZURE_CLIENT_SECRET: "azure_client_secret",
-    AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
-    SUBSCRIPTION_ID: "azure_subscription_id"
-  },
-  customizationsOnRecordings: [
-    (recording: any): any =>
-      recording.replace(
-        /"access_token":"[^"]*"/g,
-        `"access_token":"access_token"`
-      )
-  ],
-  queryParametersToSkip: []
-};
-
-export const testPollingOptions = {
-  updateIntervalInMs: isPlaybackMode() ? 0 : undefined,
-};
-
-describe("ContainerRegistry test", () => {
-  let recorder: Recorder;
-  let subscriptionId: string;
-  let client: ContainerRegistryManagementClient;
-  let location: string;
-  let resourceGroup: string;
-  let registryName: string;
-  let importPipelineName: string;
-  let exportPipelineName: string;
-  let taskName: string
-
-  beforeEach(async function() {
-    recorder = record(this, recorderEnvSetup);
-    subscriptionId = env.SUBSCRIPTION_ID;
-    // This is an example of how the environment variables are used
-    const credential = new ClientSecretCredential(
-      env.AZURE_TENANT_ID,
-      env.AZURE_CLIENT_ID,
-      env.AZURE_CLIENT_SECRET
-    );
-    client = new ContainerRegistryManagementClient(credential, subscriptionId);
-    location = "eastus";
-    resourceGroup = "myjstest";
-    registryName = "myregistryxxxyy";
-    importPipelineName = "myimportpipelinexxx";
-    exportPipelineName = 'myexportpipelinexxx';
-    taskName = "mytaskxxx";
-  });
-
-  afterEach(async function() {
-    await recorder.stop();
-  });
-
-  it("registries create test", async function() {
-    const res = await client.registries.beginCreateAndWait(resourceGroup,registryName,{
-        location: location,
-          tags: {
-              key: "value"
-          },
-          sku: {
-              name: "Premium"
-          },
-          adminUserEnabled: false
-      },testPollingOptions);
-      assert.equal(res.name,registryName)
-  });
-
-  it("importPipelines create test", async function() {
-    const res = await client.importPipelines.beginCreateAndWait(resourceGroup,registryName,importPipelineName,{
-      location: location,
-        identity: {
-            type: "SystemAssigned"
-        },
-        source: {
-            type: "AzureStorageBlobContainer",
-            uri: "https://accountname.blob.core.windows.net/containername",
-            keyVaultUri: "https://myvault.vault.azure.net/secrets/acrimportsas"
-        },
-        options: [
-            "OverwriteTags",
-            "DeleteSourceBlobOnSuccess",
-            "ContinueOnErrors"
-        ]
-    },testPollingOptions);
-    assert.equal(res.name,importPipelineName)
-  });
-
-  it("exportPipelines create test", async function() {
-    const res = await client.exportPipelines.beginCreateAndWait(resourceGroup,registryName,exportPipelineName,{
-      location: location,
-        identity: {
-            type: "SystemAssigned"
-        },
-        target: {
-            type: "AzureStorageBlobContainer",
-            uri: "https://accountname.blob.core.windows.net/containername",
-            keyVaultUri: "https://myvault.vault.azure.net/secrets/acrexportsas"
-        },
-        options: [
-            "OverwriteBlobs"
-        ]
-    },testPollingOptions);
-    assert.equal(res.name,exportPipelineName);
-  });
-
-  it("importPipelines get test", async function() {
-    const res = await client.importPipelines.get(resourceGroup,registryName,importPipelineName);
-    assert.equal(res.name,importPipelineName)
-  });
-
-  it("exportPipelines get test", async function() {
-    const res = await client.exportPipelines.get(resourceGroup,registryName,exportPipelineName);
-    assert.equal(res.name,exportPipelineName)
-  });
-
-  it("importPipelines list test", async function() {
-    const resArray = new Array();
-    for await (let item of client.importPipelines.list(resourceGroup,registryName)){
-        resArray.push(item);
-    }
-    assert.equal(resArray.length,1);
-  });
-
-  it("exportPipelines list test", async function() {
-    const resArray = new Array();
-    for await (let item of client.exportPipelines.list(resourceGroup,registryName)){
-        resArray.push(item);
-    }
-    assert.equal(resArray.length,1);
-  });
-
-  it("importPipelines delete test", async function() {
-    const res = await client.importPipelines.beginDeleteAndWait(resourceGroup,registryName,importPipelineName,testPollingOptions);
-    const resArray = new Array();
-    for await (let item of client.importPipelines.list(resourceGroup,registryName)){
-        resArray.push(item);
-    }
-    assert.equal(resArray.length,0);
-  });
-
-  it("exportPipelines delete test", async function() {
-    const res = await client.exportPipelines.beginDeleteAndWait(resourceGroup,registryName,exportPipelineName,testPollingOptions);
-    const resArray = new Array();
-    for await (let item of client.exportPipelines.list(resourceGroup,registryName)){
-        resArray.push(item);
-    }
-    assert.equal(resArray.length,0);
-  });
-
-  it("tasks create test", async function() {
-    const res = await client.tasks.beginCreateAndWait(resourceGroup,registryName,taskName,{
-      location: location,
-      tags: {
-          testkey: "value"
-      },
-      status: "Enabled",
-      platform: {
-          os: "Linux",
-          architecture: "amd64"
-      },
-      agentConfiguration: {
-          cpu: 2
-      },
-      step: {
-          type: "Docker",
-          contextPath: "https://github.com/SteveLasker/node-helloworld",
-          imageNames: ["testtask:v1"],
-          dockerFilePath: "DockerFile",
-          isPushEnabled: true,
-          noCache: false
-      },
-      trigger: {
-          baseImageTrigger: {
-              name: "myBaseImageTrigger",
-              baseImageTriggerType: "Runtime",
-              updateTriggerPayloadType: "Default",
-              status: "Enabled"
-          }
-      }
-    },testPollingOptions);
-    assert.equal(res.name,taskName);
-  });
-
-  it("tasks get test", async function() {
-    const res = await client.tasks.get(resourceGroup,registryName,taskName);
-    assert.equal(res.name,taskName);
-  });
-
-  it("tasks list test", async function() {
-    const resArray = new Array();
-    for await (let item of client.tasks.list(resourceGroup,registryName)){
-        resArray.push(item);
-    }
-    assert.equal(resArray.length,1);
-  });
-
-  it("tasks update test", async function() {
-    const res = await client.tasks.beginUpdateAndWait(resourceGroup,registryName,taskName,{
-      tags: {
-          testkey: "value"
-      },
-      status: "Enabled",
-      platform: {
-          os: "Linux",
-          architecture: "amd64"
-      },
-      agentConfiguration: {
-          cpu: 2
-      },
-      step: {
-          type: "Docker",
-          contextPath: "https://github.com/SteveLasker/node-helloworld",
-          imageNames: ["testtask:v1"],
-          dockerFilePath: "DockerFile",
-          isPushEnabled: true,
-          noCache: false
-      },
-      trigger: {
-          baseImageTrigger: {
-              name: "myBaseImageTrigger",
-              baseImageTriggerType: "Runtime",
-              updateTriggerPayloadType: "Default",
-              status: "Enabled"
-          }
-      }
-    },testPollingOptions);
-    assert.equal(res.type,"Microsoft.ContainerRegistry/registries/tasks");
-  });
-
-  it("tasks delete test", async function() {
-    const res = await client.tasks.beginDeleteAndWait(resourceGroup,registryName,taskName,testPollingOptions);
-    const resArray = new Array();
-    for await (let item of client.tasks.list(resourceGroup,registryName)){
-        resArray.push(item);
-    }
-    assert.equal(resArray.length,0);
-  });
-
-  it("registries delete test", async function() {
-    const res = await client.registries.beginDeleteAndWait(resourceGroup,registryName,testPollingOptions);
-  });
-});
diff --git a/sdk/containerregistry/arm-containerregistry/test/sampleTest.ts b/sdk/containerregistry/arm-containerregistry/test/sampleTest.ts
new file mode 100644
index 000000000000..7ed89b043e1b
--- /dev/null
+++ b/sdk/containerregistry/arm-containerregistry/test/sampleTest.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+import {
+  env,
+  record,
+  RecorderEnvironmentSetup,
+  Recorder
+} from "@azure-tools/test-recorder";
+import * as assert from "assert";
+
+const recorderEnvSetup: RecorderEnvironmentSetup = {
+  replaceableVariables: {
+    AZURE_CLIENT_ID: "azure_client_id",
+    AZURE_CLIENT_SECRET: "azure_client_secret",
+    AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
+    SUBSCRIPTION_ID: "azure_subscription_id"
+  },
+  customizationsOnRecordings: [
+    (recording: any): any =>
+      recording.replace(
+        /"access_token":"[^"]*"/g,
+        `"access_token":"access_token"`
+      )
+  ],
+  queryParametersToSkip: []
+};
+
+describe("My test", () => {
+  let recorder: Recorder;
+
+  beforeEach(async function() {
+    recorder = record(this, recorderEnvSetup);
+  });
+
+  afterEach(async function() {
+    await recorder.stop();
+  });
+
+  it("sample test", async function() {
+    console.log("Hi, I'm a test!");
+  });
+});