diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index b54a4a403e84..43ba47333310 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -10136,28 +10136,27 @@ packages:
     dev: false
 
   file:projects/arm-containerregistry.tgz:
-    resolution: {integrity: sha512-JjCI4qDg0bHKMxbGOfmkgnYRXjCwBnmI0CudZJLOpNf7Edff+q2wE4jwQpMro8uta84+t/HeUSuG2kgwy2gT6w==, tarball: file:projects/arm-containerregistry.tgz}
+    resolution: {integrity: sha512-YDsuIuZqQNMPV6lJRCH1B8QdErNoEA3SlOg2gHnNJboRuLXHwlL1FxX0CEPxf/YTPeDQqxPtMA+5CdxpqS7ZEg==, tarball: file:projects/arm-containerregistry.tgz}
     name: '@rush-temp/arm-containerregistry'
     version: 0.0.0
     dependencies:
       '@azure-tools/test-recorder': 1.0.2
       '@azure/identity': 2.0.4
-      '@microsoft/api-extractor': 7.18.11
-      '@rollup/plugin-commonjs': 21.1.0_rollup@2.70.2
-      '@rollup/plugin-json': 4.1.0_rollup@2.70.2
-      '@rollup/plugin-multi-entry': 4.1.0_rollup@2.70.2
-      '@rollup/plugin-node-resolve': 13.2.1_rollup@2.70.2
+      '@microsoft/api-extractor': 7.23.0
+      '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1
+      '@rollup/plugin-json': 4.1.0_rollup@1.32.1
+      '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1
+      '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1
       cross-env: 7.0.3
       mkdirp: 1.0.4
       mocha: 7.2.0
       rimraf: 3.0.2
-      rollup: 2.70.2
-      rollup-plugin-sourcemaps: 0.6.3_rollup@2.70.2
+      rollup: 1.32.1
+      rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1
       tslib: 2.4.0
       typescript: 4.2.4
       uglify-js: 3.15.4
     transitivePeerDependencies:
-      - '@types/node'
       - debug
       - encoding
       - supports-color
@@ -15399,7 +15398,7 @@ packages:
     dev: false
 
   file:projects/eventhubs-checkpointstore-table.tgz:
-    resolution: {integrity: sha512-lV2JaA7ADYooOapQrBAwk+4lQXa/VWgdJLC2WoZsAi/l5yV9hlK9GhAiX/+x3GXQGFHfsqw/oSZO929dsMf0Ag==, tarball: file:projects/eventhubs-checkpointstore-table.tgz}
+    resolution: {integrity: sha512-TUGShiiPux1M2OTQRjDWGHM6uwmGI1iiCTccm9q9OiImdj3wnes/xn44h3Wvv3gzqkA0Fj8Xeo/DGJLt1RGitg==, tarball: file:projects/eventhubs-checkpointstore-table.tgz}
     name: '@rush-temp/eventhubs-checkpointstore-table'
     version: 0.0.0
     dependencies:
@@ -16292,7 +16291,7 @@ packages:
     dev: false
 
   file:projects/perf-event-hubs.tgz:
-    resolution: {integrity: sha512-0Shj+f5HUSjnyL56js5KhwURz4fwSgQu9vAxnC5DawSdWpExDLiGSLG+pVm7YuDQ432ondadTZDYgdkVqlFE5A==, tarball: file:projects/perf-event-hubs.tgz}
+    resolution: {integrity: sha512-BHwbm1iu6BThr0P43MEqVdgEpQ984u4C6M9orgaZdvJXRqU9YvoSedqmIu4XNcBbIY1MsiH1DUT+gU6zDCudaw==, tarball: file:projects/perf-event-hubs.tgz}
     name: '@rush-temp/perf-event-hubs'
     version: 0.0.0
     dependencies:
diff --git a/sdk/containerregistry/arm-containerregistry/CHANGELOG.md b/sdk/containerregistry/arm-containerregistry/CHANGELOG.md
index 8112b7a0d989..dd227e8fe1c8 100644
--- a/sdk/containerregistry/arm-containerregistry/CHANGELOG.md
+++ b/sdk/containerregistry/arm-containerregistry/CHANGELOG.md
@@ -1,16 +1,6 @@
 # Release History
-
-## 10.1.0-beta.3 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
-## 10.1.0-beta.2 (2022-04-12)
+    
+## 10.1.0-beta.3 (2022-05-06)
     
 **Features**
 
@@ -24,6 +14,7 @@
   - Added operation Registries.beginGenerateCredentialsAndWait
   - Added Interface ActivationProperties
   - Added Interface ActiveDirectoryObject
+  - Added Interface AzureADAuthenticationAsArmPolicy
   - Added Interface ConnectedRegistriesCreateOptionalParams
   - Added Interface ConnectedRegistriesDeactivateOptionalParams
   - Added Interface ConnectedRegistriesDeleteOptionalParams
@@ -76,6 +67,7 @@
   - Added Interface ScopeMapsListOptionalParams
   - Added Interface ScopeMapsUpdateOptionalParams
   - Added Interface ScopeMapUpdateParameters
+  - Added Interface SoftDeletePolicy
   - Added Interface StatusDetailProperties
   - Added Interface SyncProperties
   - Added Interface SyncUpdateProperties
@@ -92,9 +84,9 @@
   - Added Interface TokensListOptionalParams
   - Added Interface TokensUpdateOptionalParams
   - Added Interface TokenUpdateParameters
-  - Added Interface VirtualNetworkRule
   - Added Type Alias ActivationStatus
   - Added Type Alias AuditLogStatus
+  - Added Type Alias AzureADAuthenticationAsArmPolicyStatus
   - Added Type Alias CertificateType
   - Added Type Alias ConnectedRegistriesCreateResponse
   - Added Type Alias ConnectedRegistriesGetResponse
@@ -141,7 +133,8 @@
   - Added Type Alias TokensListResponse
   - Added Type Alias TokenStatus
   - Added Type Alias TokensUpdateResponse
-  - Interface NetworkRuleSet has a new optional parameter virtualNetworkRules
+  - Interface Policies has a new optional parameter azureADAuthenticationAsArmPolicy
+  - Interface Policies has a new optional parameter softDeletePolicy
   - Interface RegistryUpdateParameters has a new optional parameter anonymousPullEnabled
   - Class ContainerRegistryManagementClient has a new parameter connectedRegistries
   - Class ContainerRegistryManagementClient has a new parameter exportPipelines
@@ -152,6 +145,7 @@
   - Type Alias Registry has a new parameter anonymousPullEnabled
   - Added Enum KnownActivationStatus
   - Added Enum KnownAuditLogStatus
+  - Added Enum KnownAzureADAuthenticationAsArmPolicyStatus
   - Added Enum KnownCertificateType
   - Added Enum KnownConnectedRegistryMode
   - Added Enum KnownConnectionState
@@ -164,7 +158,6 @@
   - Added Enum KnownTokenCertificateName
   - Added Enum KnownTokenPasswordName
   - Added Enum KnownTokenStatus
-  - Bug fix
     
     
 ## 10.0.0 (2021-12-28)
diff --git a/sdk/containerregistry/arm-containerregistry/README.md b/sdk/containerregistry/arm-containerregistry/README.md
index a5d5784d6946..47c0b97d1adf 100644
--- a/sdk/containerregistry/arm-containerregistry/README.md
+++ b/sdk/containerregistry/arm-containerregistry/README.md
@@ -16,8 +16,6 @@ This package contains an isomorphic SDK (runs both in Node.js and in browsers) f
 - [LTS versions of Node.js](https://nodejs.org/about/releases/)
 - Latest versions of Safari, Chrome, Edge and Firefox.
 
-See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details.
-
 ### Prerequisites
 
 - An [Azure subscription][azure_sub].
@@ -51,17 +49,8 @@ For more information about how to create an Azure AD Application check out [this
 ```javascript
 const { ContainerRegistryManagementClient } = require("@azure/arm-containerregistry");
 const { DefaultAzureCredential } = require("@azure/identity");
-// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details.
-
 const subscriptionId = "00000000-0000-0000-0000-000000000000";
 const client = new ContainerRegistryManagementClient(new DefaultAzureCredential(), subscriptionId);
-
-// For client-side applications running in the browser, use this code instead:
-// const credential = new InteractiveBrowserCredential({
-//   tenantId: "<YOUR_TENANT_ID>",
-//   clientId: "<YOUR_CLIENT_ID>"
-// });
-// const client = new ContainerRegistryManagementClient(credential, subscriptionId);
 ```
 
 
diff --git a/sdk/containerregistry/arm-containerregistry/_meta.json b/sdk/containerregistry/arm-containerregistry/_meta.json
index da41c687f973..a1e557f460be 100644
--- a/sdk/containerregistry/arm-containerregistry/_meta.json
+++ b/sdk/containerregistry/arm-containerregistry/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "82fdf284eea880a8e027c354911a814999a77178",
-  "readme": "specification\\containerregistry\\resource-manager\\readme.md",
-  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\containerservice\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.18.20220329.1 --generate-sample=true",
+  "commit": "eb5e1c11ed65d4b09c8d8d689abe0d0203829da4",
+  "readme": "specification/containerregistry/resource-manager/readme.md",
+  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_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.20220105.1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.2.1",
-  "use": "@autorest/typescript@6.0.0-alpha.18.20220329.1"
-}
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.3.0",
+  "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1"
+}
\ No newline at end of file
diff --git a/sdk/containerregistry/arm-containerregistry/package.json b/sdk/containerregistry/arm-containerregistry/package.json
index 528ce5cb652f..d69c308245d0 100644
--- a/sdk/containerregistry/arm-containerregistry/package.json
+++ b/sdk/containerregistry/arm-containerregistry/package.json
@@ -28,14 +28,14 @@
   "module": "./dist-esm/src/index.js",
   "types": "./types/arm-containerregistry.d.ts",
   "devDependencies": {
-    "@microsoft/api-extractor": "7.18.11",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-multi-entry": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@microsoft/api-extractor": "^7.18.11",
+    "@rollup/plugin-commonjs": "11.0.2",
+    "@rollup/plugin-json": "^4.0.0",
+    "@rollup/plugin-multi-entry": "^3.0.0",
+    "@rollup/plugin-node-resolve": "^8.0.0",
     "mkdirp": "^1.0.4",
-    "rollup": "^2.66.1",
-    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup": "^1.16.3",
+    "rollup-plugin-sourcemaps": "^0.4.2",
     "typescript": "~4.2.0",
     "uglify-js": "^3.4.9",
     "rimraf": "^3.0.0",
@@ -98,21 +98,5 @@
     "docs": "echo skipped"
   },
   "sideEffects": false,
-  "//metadata": {
-    "constantPaths": [
-      {
-        "path": "src/containerRegistryManagementClient.ts",
-        "prefix": "packageDetails"
-      }
-    ]
-  },
-  "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-containerregistry?view=azure-node-preview"
-  }
-}
+  "autoPublish": true
+}
\ No newline at end of file
diff --git a/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md b/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md
index a768541fca6f..9c56a5960979 100644
--- a/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md
+++ b/sdk/containerregistry/arm-containerregistry/review/arm-containerregistry.api.md
@@ -164,6 +164,14 @@ export interface AuthInfoUpdateParameters {
     tokenType?: TokenType;
 }
 
+// @public
+export interface AzureADAuthenticationAsArmPolicy {
+    status?: AzureADAuthenticationAsArmPolicyStatus;
+}
+
+// @public
+export type AzureADAuthenticationAsArmPolicyStatus = string;
+
 // @public
 export interface BaseImageDependency {
     digest?: string;
@@ -823,6 +831,14 @@ export enum KnownAuditLogStatus {
     Enabled = "Enabled"
 }
 
+// @public
+export enum KnownAzureADAuthenticationAsArmPolicyStatus {
+    // (undocumented)
+    Disabled = "disabled",
+    // (undocumented)
+    Enabled = "enabled"
+}
+
 // @public
 export enum KnownBaseImageDependencyType {
     // (undocumented)
@@ -1270,7 +1286,6 @@ export type NetworkRuleBypassOptions = string;
 export interface NetworkRuleSet {
     defaultAction: DefaultAction;
     ipRules?: IPRule[];
-    virtualNetworkRules?: VirtualNetworkRule[];
 }
 
 // @public
@@ -1351,6 +1366,12 @@ export interface OverrideTaskStepProperties {
     values?: SetValue[];
 }
 
+// @public
+export interface PackageType {
+    readonly endpoint?: string;
+    name?: string;
+}
+
 // @public
 export interface ParentProperties {
     id?: string;
@@ -1503,9 +1524,11 @@ export interface PlatformUpdateParameters {
 
 // @public
 export interface Policies {
+    azureADAuthenticationAsArmPolicy?: AzureADAuthenticationAsArmPolicy;
     exportPolicy?: ExportPolicy;
     quarantinePolicy?: QuarantinePolicy;
     retentionPolicy?: RetentionPolicy;
+    softDeletePolicy?: SoftDeletePolicy;
     trustPolicy?: TrustPolicy;
 }
 
@@ -2226,6 +2249,13 @@ export type SkuName = string;
 // @public
 export type SkuTier = string;
 
+// @public
+export interface SoftDeletePolicy {
+    readonly lastUpdatedTime?: Date;
+    retentionDays?: number;
+    status?: PolicyStatus;
+}
+
 // @public
 export interface Source {
     addr?: string;
@@ -2314,6 +2344,11 @@ export interface StatusDetailProperties {
 // @public
 export type StepType = string;
 
+// @public
+export interface StorageAccountProperties {
+    id: string;
+}
+
 // @public
 export interface SyncProperties {
     readonly gatewayEndpoint?: string;
@@ -2771,12 +2806,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/rollup.config.js b/sdk/containerregistry/arm-containerregistry/rollup.config.js
index 3f89d7309da5..9be1955eb7f1 100644
--- a/sdk/containerregistry/arm-containerregistry/rollup.config.js
+++ b/sdk/containerregistry/arm-containerregistry/rollup.config.js
@@ -14,14 +14,62 @@ import json from "@rollup/plugin-json";
 
 import nodeBuiltins from "builtin-modules";
 
+/**
+ * Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api.
+ *
+ * NOTE: this manual configuration is only needed because OpenTelemetry uses an
+ * __exportStar downleveled helper function to declare its exports which confuses
+ * rollup's automatic discovery mechanism.
+ *
+ * @returns an object reference that can be `...`'d into your cjs() configuration.
+ */
+export function openTelemetryCommonJs() {
+  const namedExports = {};
+
+  for (const key of [
+    "@opentelemetry/api",
+    "@azure/core-tracing/node_modules/@opentelemetry/api"
+  ]) {
+    namedExports[key] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "SpanStatusCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  const releasedOpenTelemetryVersions = ["0.10.2", "1.0.0-rc.0"];
+
+  for (const version of releasedOpenTelemetryVersions) {
+    namedExports[
+      // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
+      `../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
+    ] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "StatusCode",
+      "CanonicalCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  return namedExports;
+}
+
 // #region Warning Handler
 
 /**
- * A function that can determine whether a rollup warning should be ignored. If
+ * A function that can determine whether a rollupwarning should be ignored. If
  * the function returns `true`, then the warning will not be displayed.
  */
 
-function ignoreNiseSinonEval(warning) {
+function ignoreNiseSinonEvalWarnings(warning) {
   return (
     warning.code === "EVAL" &&
     warning.id &&
@@ -30,14 +78,17 @@ function ignoreNiseSinonEval(warning) {
   );
 }
 
-function ignoreChaiCircularDependency(warning) {
+function ignoreChaiCircularDependencyWarnings(warning) {
   return (
     warning.code === "CIRCULAR_DEPENDENCY" &&
     warning.importer && warning.importer.includes("node_modules/chai") === true
   );
 }
 
-const warningInhibitors = [ignoreChaiCircularDependency, ignoreNiseSinonEval];
+const warningInhibitors = [
+  ignoreChaiCircularDependencyWarnings,
+  ignoreNiseSinonEvalWarnings
+];
 
 /**
  * Construct a warning handler for the shared rollup configuration
@@ -71,7 +122,22 @@ function makeBrowserTestConfig() {
       nodeResolve({
         mainFields: ["module", "browser"]
       }),
-      cjs(),
+      cjs({
+        namedExports: {
+          // Chai's strange internal architecture makes it impossible to statically
+          // analyze its exports.
+          chai: [
+            "version",
+            "use",
+            "util",
+            "config",
+            "expect",
+            "should",
+            "assert"
+          ],
+          ...openTelemetryCommonJs()
+        }
+      }),
       json(),
       sourcemaps()
       //viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
@@ -107,7 +173,7 @@ export function makeConfig(pkg, options) {
     ],
     output: { file: "dist/index.js", format: "cjs", sourcemap: true },
     preserveSymlinks: false,
-    plugins: [sourcemaps(), nodeResolve()]
+    plugins: [sourcemaps(), nodeResolve(), cjs()]
   };
 
   const config = [baseConfig];
diff --git a/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts b/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts
index a78351f7f413..9a6ec0e2e017 100644
--- a/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/containerRegistryManagementClient.ts
@@ -90,8 +90,7 @@ export class ContainerRegistryManagementClient extends coreClient.ServiceClient
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri:
-        options.endpoint ?? options.baseUri ?? "https://management.azure.com"
+      baseUri: options.endpoint || "https://management.azure.com"
     };
     super(optionsWithDefaults);
     // Parameter assignments
diff --git a/sdk/containerregistry/arm-containerregistry/src/models/index.ts b/sdk/containerregistry/arm-containerregistry/src/models/index.ts
index 436e0085949c..7cbbb9f70581 100644
--- a/sdk/containerregistry/arm-containerregistry/src/models/index.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/models/index.ts
@@ -588,20 +588,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. */
@@ -620,6 +610,10 @@ export interface Policies {
   retentionPolicy?: RetentionPolicy;
   /** The export policy for a container registry. */
   exportPolicy?: ExportPolicy;
+  /** The policy for using ARM audience token for a container registry. */
+  azureADAuthenticationAsArmPolicy?: AzureADAuthenticationAsArmPolicy;
+  /** The soft delete policy for a container registry. */
+  softDeletePolicy?: SoftDeletePolicy;
 }
 
 /** The quarantine policy for a container registry. */
@@ -655,6 +649,25 @@ export interface ExportPolicy {
   status?: ExportPolicyStatus;
 }
 
+/** The policy for using ARM audience token for a container registry. */
+export interface AzureADAuthenticationAsArmPolicy {
+  /** The value that indicates whether the policy is enabled or not. */
+  status?: AzureADAuthenticationAsArmPolicyStatus;
+}
+
+/** The soft delete policy for a container registry */
+export interface SoftDeletePolicy {
+  /** The number of days after which a soft-deleted item is permanently deleted. */
+  retentionDays?: number;
+  /**
+   * The timestamp when the policy was last updated.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly lastUpdatedTime?: Date;
+  /** The value that indicates whether the policy is enabled or not. */
+  status?: PolicyStatus;
+}
+
 export interface EncryptionProperty {
   /** Indicates whether or not the encryption is enabled for container registry. */
   status?: EncryptionStatus;
@@ -1511,6 +1524,23 @@ export interface BaseImageTriggerUpdateParameters {
   name: 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;
+}
+
 /** 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. */
@@ -2586,6 +2616,22 @@ export enum KnownExportPolicyStatus {
  */
 export type ExportPolicyStatus = string;
 
+/** Known values of {@link AzureADAuthenticationAsArmPolicyStatus} that the service accepts. */
+export enum KnownAzureADAuthenticationAsArmPolicyStatus {
+  Enabled = "enabled",
+  Disabled = "disabled"
+}
+
+/**
+ * Defines values for AzureADAuthenticationAsArmPolicyStatus. \
+ * {@link KnownAzureADAuthenticationAsArmPolicyStatus} can be used interchangeably with AzureADAuthenticationAsArmPolicyStatus,
+ *  this enum contains the known values that the service supports.
+ * ### Known values supported by the service
+ * **enabled** \
+ * **disabled**
+ */
+export type AzureADAuthenticationAsArmPolicyStatus = string;
+
 /** Known values of {@link EncryptionStatus} that the service accepts. */
 export enum KnownEncryptionStatus {
   Enabled = "enabled",
diff --git a/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts b/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts
index 2041f5bd768e..6884ca540069 100644
--- a/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/models/mappers.ts
@@ -1471,18 +1471,6 @@ export const NetworkRuleSet: coreClient.CompositeMapper = {
           name: "String"
         }
       },
-      virtualNetworkRules: {
-        serializedName: "virtualNetworkRules",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "VirtualNetworkRule"
-            }
-          }
-        }
-      },
       ipRules: {
         serializedName: "ipRules",
         type: {
@@ -1499,34 +1487,13 @@ export const NetworkRuleSet: coreClient.CompositeMapper = {
   }
 };
 
-export const VirtualNetworkRule: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "VirtualNetworkRule",
-    modelProperties: {
-      action: {
-        serializedName: "action",
-        type: {
-          name: "String"
-        }
-      },
-      virtualNetworkResourceId: {
-        serializedName: "id",
-        required: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
 export const IPRule: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IPRule",
     modelProperties: {
       action: {
+        defaultValue: "Allow",
         serializedName: "action",
         type: {
           name: "String"
@@ -1575,6 +1542,20 @@ export const Policies: coreClient.CompositeMapper = {
           name: "Composite",
           className: "ExportPolicy"
         }
+      },
+      azureADAuthenticationAsArmPolicy: {
+        serializedName: "azureADAuthenticationAsArmPolicy",
+        type: {
+          name: "Composite",
+          className: "AzureADAuthenticationAsArmPolicy"
+        }
+      },
+      softDeletePolicy: {
+        serializedName: "softDeletePolicy",
+        type: {
+          name: "Composite",
+          className: "SoftDeletePolicy"
+        }
       }
     }
   }
@@ -1662,6 +1643,51 @@ export const ExportPolicy: coreClient.CompositeMapper = {
   }
 };
 
+export const AzureADAuthenticationAsArmPolicy: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "AzureADAuthenticationAsArmPolicy",
+    modelProperties: {
+      status: {
+        defaultValue: "enabled",
+        serializedName: "status",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const SoftDeletePolicy: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "SoftDeletePolicy",
+    modelProperties: {
+      retentionDays: {
+        defaultValue: 7,
+        serializedName: "retentionDays",
+        type: {
+          name: "Number"
+        }
+      },
+      lastUpdatedTime: {
+        serializedName: "lastUpdatedTime",
+        readOnly: true,
+        type: {
+          name: "DateTime"
+        }
+      },
+      status: {
+        serializedName: "status",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const EncryptionProperty: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -4080,6 +4106,44 @@ export const BaseImageTriggerUpdateParameters: coreClient.CompositeMapper = {
   }
 };
 
+export const StorageAccountProperties: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "StorageAccountProperties",
+    modelProperties: {
+      id: {
+        serializedName: "id",
+        required: true,
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const PackageType: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "PackageType",
+    modelProperties: {
+      name: {
+        serializedName: "name",
+        type: {
+          name: "String"
+        }
+      },
+      endpoint: {
+        serializedName: "endpoint",
+        readOnly: true,
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ActiveDirectoryObject: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
diff --git a/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts b/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts
index bf424b7f0ae8..ab7bf7143151 100644
--- a/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/models/parameters.ts
@@ -69,7 +69,7 @@ export const $host: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2021-12-01-preview",
+    defaultValue: "2022-02-01-preview",
     isConstant: true,
     serializedName: "api-version",
     type: {
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts b/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts
index 6749601c7c6f..9e6cd9ceff1d 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/agentPools.ts
@@ -187,12 +187,10 @@ export class AgentPoolsImpl implements AgentPools {
       { resourceGroupName, registryName, agentPoolName, agentPool, options },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -277,12 +275,10 @@ export class AgentPoolsImpl implements AgentPools {
       { resourceGroupName, registryName, agentPoolName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -377,12 +373,10 @@ export class AgentPoolsImpl implements AgentPools {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts b/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts
index 69b2feef77ef..8d48cca31a80 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/connectedRegistries.ts
@@ -209,12 +209,10 @@ export class ConnectedRegistriesImpl implements ConnectedRegistries {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -299,12 +297,10 @@ export class ConnectedRegistriesImpl implements ConnectedRegistries {
       { resourceGroupName, registryName, connectedRegistryName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -399,12 +395,10 @@ export class ConnectedRegistriesImpl implements ConnectedRegistries {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -489,12 +483,10 @@ export class ConnectedRegistriesImpl implements ConnectedRegistries {
       { resourceGroupName, registryName, connectedRegistryName, options },
       deactivateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts b/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts
index c7fb4b67320b..bf7efd0d0e1f 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/exportPipelines.ts
@@ -205,12 +205,10 @@ export class ExportPipelinesImpl implements ExportPipelines {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -295,12 +293,10 @@ export class ExportPipelinesImpl implements ExportPipelines {
       { resourceGroupName, registryName, exportPipelineName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts b/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts
index 1c51893f7a62..84f82b82c7c5 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/importPipelines.ts
@@ -205,12 +205,10 @@ export class ImportPipelinesImpl implements ImportPipelines {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -295,12 +293,10 @@ export class ImportPipelinesImpl implements ImportPipelines {
       { resourceGroupName, registryName, importPipelineName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts b/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts
index 67b1d3defc9b..b4c929b96cdd 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/pipelineRuns.ts
@@ -205,12 +205,10 @@ export class PipelineRunsImpl implements PipelineRuns {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -295,12 +293,10 @@ export class PipelineRunsImpl implements PipelineRuns {
       { resourceGroupName, registryName, pipelineRunName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts b/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts
index 85453ad09dc2..3157fbaf0af7 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/privateEndpointConnections.ts
@@ -211,12 +211,10 @@ export class PrivateEndpointConnectionsImpl
       },
       createOrUpdateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -306,12 +304,10 @@ export class PrivateEndpointConnectionsImpl
       },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts b/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts
index 328b62d225f7..6d6c03c0b435 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/registries.ts
@@ -297,12 +297,10 @@ export class RegistriesImpl implements Registries {
       { resourceGroupName, registryName, parameters, options },
       importImageOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -447,12 +445,10 @@ export class RegistriesImpl implements Registries {
       { resourceGroupName, registryName, registry, options },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -532,12 +528,10 @@ export class RegistriesImpl implements Registries {
       { resourceGroupName, registryName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -621,12 +615,10 @@ export class RegistriesImpl implements Registries {
       { resourceGroupName, registryName, registryUpdateParameters, options },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -813,12 +805,10 @@ export class RegistriesImpl implements Registries {
       },
       generateCredentialsOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -905,12 +895,10 @@ export class RegistriesImpl implements Registries {
       { resourceGroupName, registryName, runRequest, options },
       scheduleRunOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts b/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts
index 4740152e62e0..84876b1a73e8 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/replications.ts
@@ -208,12 +208,10 @@ export class ReplicationsImpl implements Replications {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -298,12 +296,10 @@ export class ReplicationsImpl implements Replications {
       { resourceGroupName, registryName, replicationName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -398,12 +394,10 @@ export class ReplicationsImpl implements Replications {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts b/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts
index db8ab48cac05..b0f5a4f71fb1 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/runs.ts
@@ -199,12 +199,10 @@ export class RunsImpl implements Runs {
       { resourceGroupName, registryName, runId, runUpdateParameters, options },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -308,12 +306,10 @@ export class RunsImpl implements Runs {
       { resourceGroupName, registryName, runId, options },
       cancelOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts b/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts
index c974bd12466f..13756bbce4ed 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/scopeMaps.ts
@@ -208,12 +208,10 @@ export class ScopeMapsImpl implements ScopeMaps {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -298,12 +296,10 @@ export class ScopeMapsImpl implements ScopeMaps {
       { resourceGroupName, registryName, scopeMapName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -398,12 +394,10 @@ export class ScopeMapsImpl implements ScopeMaps {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts b/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts
index eac13b859a51..458bbb2daa25 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/taskRuns.ts
@@ -187,12 +187,10 @@ export class TaskRunsImpl implements TaskRuns {
       { resourceGroupName, registryName, taskRunName, taskRun, options },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -277,12 +275,10 @@ export class TaskRunsImpl implements TaskRuns {
       { resourceGroupName, registryName, taskRunName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -377,12 +373,10 @@ export class TaskRunsImpl implements TaskRuns {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts b/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts
index c57f21366f99..637b3a1ca999 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/tasks.ts
@@ -207,12 +207,10 @@ export class TasksImpl implements Tasks {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -297,12 +295,10 @@ export class TasksImpl implements Tasks {
       { resourceGroupName, registryName, taskName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -394,12 +390,10 @@ export class TasksImpl implements Tasks {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts b/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts
index 6de316e6fc7c..28545229e82c 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/tokens.ts
@@ -205,12 +205,10 @@ export class TokensImpl implements Tokens {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -295,12 +293,10 @@ export class TokensImpl implements Tokens {
       { resourceGroupName, registryName, tokenName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -392,12 +388,10 @@ export class TokensImpl implements Tokens {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
diff --git a/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts b/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts
index cda5fc2ccb0d..e3c92d76e351 100644
--- a/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts
+++ b/sdk/containerregistry/arm-containerregistry/src/operations/webhooks.ts
@@ -298,12 +298,10 @@ export class WebhooksImpl implements Webhooks {
       },
       createOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -388,12 +386,10 @@ export class WebhooksImpl implements Webhooks {
       { resourceGroupName, registryName, webhookName, options },
       deleteOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
@@ -488,12 +484,10 @@ export class WebhooksImpl implements Webhooks {
       },
       updateOperationSpec
     );
-    const poller = new LroEngine(lro, {
+    return new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
-    await poller.poll();
-    return poller;
   }
 
   /**
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!");
+  });
+});
diff --git a/sdk/containerregistry/arm-containerregistry/tsconfig.json b/sdk/containerregistry/arm-containerregistry/tsconfig.json
index 87bcf4efb4f3..3e6ae96443f3 100644
--- a/sdk/containerregistry/arm-containerregistry/tsconfig.json
+++ b/sdk/containerregistry/arm-containerregistry/tsconfig.json
@@ -15,17 +15,11 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true,
-    "paths": {
-      "@azure/arm-containerregistry": [
-        "./src/index"
-      ]
-    }
+    "importHelpers": true
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
+    "./test/**/*.ts"
   ],
   "exclude": [
     "node_modules"