diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/README.md b/sdk/advisor/arm-advisor/samples/v3/javascript/README.md
index adc2fa3140c2..0a4a52c9458b 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/README.md
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/README.md
@@ -47,10 +47,10 @@ npm install
 node configurationsCreateInResourceGroupSample.js
 ```
 
-Alternatively, run a single sample with the correct environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
+Alternatively, run a single sample with the required environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
 
 ```bash
-cross-env ADVISOR_SUBSCRIPTION_ID="<advisor subscription id>" node configurationsCreateInResourceGroupSample.js
+npx cross-env ADVISOR_SUBSCRIPTION_ID="<advisor subscription id>" node configurationsCreateInResourceGroupSample.js
 ```
 
 ## Next Steps
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInResourceGroupSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInResourceGroupSample.js
index 4c27b1042cbc..68b9a906f576 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInResourceGroupSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInResourceGroupSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Create/Overwrite Azure Advisor configuration.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Create/Overwrite Azure Advisor configuration.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/CreateConfiguration.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function putConfigurations() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const configurationName = "default";
@@ -48,13 +42,13 @@ async function putConfigurations() {
   const result = await client.configurations.createInResourceGroup(
     configurationName,
     resourceGroup,
-    configContract
+    configContract,
   );
   console.log(result);
 }
 
 async function main() {
-  putConfigurations();
+  await putConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInSubscriptionSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInSubscriptionSample.js
index 799047fa3e3a..de1039b36241 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInSubscriptionSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsCreateInSubscriptionSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Create/Overwrite Azure Advisor configuration and also delete all configurations of contained resource groups.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Create/Overwrite Azure Advisor configuration and also delete all configurations of contained resource groups.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/CreateConfiguration.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function putConfigurations() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const configurationName = "default";
@@ -46,13 +40,13 @@ async function putConfigurations() {
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const result = await client.configurations.createInSubscription(
     configurationName,
-    configContract
+    configContract,
   );
   console.log(result);
 }
 
 async function main() {
-  putConfigurations();
+  await putConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListByResourceGroupSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListByResourceGroupSample.js
index 22efb72eeaa2..94a2e56f229b 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListByResourceGroupSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListByResourceGroupSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Retrieve Azure Advisor configurations.
@@ -18,20 +7,25 @@ require("dotenv").config();
  * @summary Retrieve Azure Advisor configurations.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListConfigurations.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getConfigurations() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const resourceGroup = "resourceGroup";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.configurations.listByResourceGroup(resourceGroup)) {
+  for await (const item of client.configurations.listByResourceGroup(resourceGroup)) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
 async function main() {
-  getConfigurations();
+  await getConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListBySubscriptionSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListBySubscriptionSample.js
index 4384a162c6a0..358013ee1a6a 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListBySubscriptionSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/configurationsListBySubscriptionSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Retrieve Azure Advisor configurations and also retrieve configurations of contained resource groups.
@@ -18,19 +7,24 @@ require("dotenv").config();
  * @summary Retrieve Azure Advisor configurations and also retrieve configurations of contained resource groups.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListConfigurations.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getConfigurations() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.configurations.listBySubscription()) {
+  for await (const item of client.configurations.listBySubscription()) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
 async function main() {
-  getConfigurations();
+  await getConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/package.json b/sdk/advisor/arm-advisor/samples/v3/javascript/package.json
index fa3040410894..f875dd397dd2 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/package.json
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/package.json
@@ -16,7 +16,8 @@
     "azure",
     "typescript",
     "browser",
-    "isomorphic"
+    "isomorphic",
+    "cloud"
   ],
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -27,6 +28,9 @@
   "dependencies": {
     "@azure/arm-advisor": "latest",
     "dotenv": "latest",
-    "@azure/identity": "^4.2.1"
+    "@azure/identity": "^4.13.0"
+  },
+  "devDependencies": {
+    "cross-env": "latest"
   }
 }
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataGetSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataGetSample.js
index 00616c220f2e..333801facb9c 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataGetSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataGetSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Gets the metadata entity.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Gets the metadata entity.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetRecommendationMetadataEntity.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getMetadata() {
   const name = "types";
   const credential = new DefaultAzureCredential();
@@ -27,7 +21,7 @@ async function getMetadata() {
 }
 
 async function main() {
-  getMetadata();
+  await getMetadata();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataListSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataListSample.js
index 0d8ce1f0fc65..c86a2794b16b 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataListSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationMetadataListSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Gets the list of metadata entities.
@@ -18,18 +7,23 @@ require("dotenv").config();
  * @summary Gets the list of metadata entities.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListRecommendationMetadata.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getMetadata() {
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential);
   const resArray = new Array();
-  for await (let item of client.recommendationMetadata.list()) {
+  for await (const item of client.recommendationMetadata.list()) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
 async function main() {
-  getMetadata();
+  await getMetadata();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGenerateSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGenerateSample.js
index 379a387d1311..b41517bf6c25 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGenerateSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGenerateSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Initiates the recommendation generation or computation process for a subscription. This operation is asynchronous. The generated recommendations are stored in a cache in the Advisor service.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Initiates the recommendation generation or computation process for a subscription. This operation is asynchronous. The generated recommendations are stored in a cache in the Advisor service.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GenerateRecommendations.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function generateRecommendations() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const credential = new DefaultAzureCredential();
@@ -27,7 +21,7 @@ async function generateRecommendations() {
 }
 
 async function main() {
-  generateRecommendations();
+  await generateRecommendations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetGenerateStatusSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetGenerateStatusSample.js
index 97ae7726b645..c254f590826d 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetGenerateStatusSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetGenerateStatusSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Retrieves the status of the recommendation computation or generation process. Invoke this API after calling the generation recommendation. The URI of this API is returned in the Location field of the response header.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Retrieves the status of the recommendation computation or generation process. Invoke this API after calling the generation recommendation. The URI of this API is returned in the Location field of the response header.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/EmptyResponse.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getGenerateStatus() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const operationId = "operationGUID";
@@ -28,7 +22,7 @@ async function getGenerateStatus() {
 }
 
 async function main() {
-  getGenerateStatus();
+  await getGenerateStatus();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetSample.js
index 1815d8498623..5c63b6d2fed8 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsGetSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Obtains details of a cached recommendation.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Obtains details of a cached recommendation.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetRecommendationDetail.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getRecommendationDetail() {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
@@ -28,7 +22,7 @@ async function getRecommendationDetail() {
 }
 
 async function main() {
-  getRecommendationDetail();
+  await getRecommendationDetail();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsListSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsListSample.js
index e58a676f8bb9..f2de110c9864 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsListSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/recommendationsListSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Obtains cached recommendations for a subscription. The recommendations are generated or computed by invoking generateRecommendations.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Obtains cached recommendations for a subscription. The recommendations are generated or computed by invoking generateRecommendations.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListRecommendations.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function listRecommendations() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const top = 10;
@@ -25,14 +19,14 @@ async function listRecommendations() {
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.recommendations.list(options)) {
+  for await (const item of client.recommendations.list(options)) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
 async function main() {
-  listRecommendations();
+  await listRecommendations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsCreateSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsCreateSample.js
index 80256de7806c..d78b2bafaaf0 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsCreateSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsCreateSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Enables the snoozed or dismissed attribute of a recommendation. The snoozed or dismissed attribute is referred to as a suppression. Use this API to create or update the snoozed or dismissed status of a recommendation.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Enables the snoozed or dismissed attribute of a recommendation. The snoozed or dismissed attribute is referred to as a suppression. Use this API to create or update the snoozed or dismissed status of a recommendation.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/CreateSuppression.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function createSuppression() {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
@@ -29,13 +23,13 @@ async function createSuppression() {
     resourceUri,
     recommendationId,
     name,
-    suppressionContract
+    suppressionContract,
   );
   console.log(result);
 }
 
 async function main() {
-  createSuppression();
+  await createSuppression();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsDeleteSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsDeleteSample.js
index eab63543d019..e5bdd032687f 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsDeleteSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsDeleteSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Enables the activation of a snoozed or dismissed recommendation. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Enables the activation of a snoozed or dismissed recommendation. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/DeleteSuppression.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function deleteSuppression() {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
@@ -29,7 +23,7 @@ async function deleteSuppression() {
 }
 
 async function main() {
-  deleteSuppression();
+  await deleteSuppression();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsGetSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsGetSample.js
index 18842e246b45..629b472fce79 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsGetSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsGetSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Obtains the details of a suppression.
@@ -18,6 +7,11 @@ require("dotenv").config();
  * @summary Obtains the details of a suppression.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetSuppressionDetail.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function getSuppressionDetail() {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
@@ -29,7 +23,7 @@ async function getSuppressionDetail() {
 }
 
 async function main() {
-  getSuppressionDetail();
+  await getSuppressionDetail();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsListSample.js b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsListSample.js
index 70d421bfc189..58e8946593dd 100644
--- a/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsListSample.js
+++ b/sdk/advisor/arm-advisor/samples/v3/javascript/suppressionsListSample.js
@@ -1,16 +1,5 @@
-/*
- * 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.
- */
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const { AdvisorManagementClient } = require("@azure/arm-advisor");
-const { DefaultAzureCredential } = require("@azure/identity");
-require("dotenv").config();
 
 /**
  * This sample demonstrates how to Retrieves the list of snoozed or dismissed suppressions for a subscription. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
@@ -18,19 +7,24 @@ require("dotenv").config();
  * @summary Retrieves the list of snoozed or dismissed suppressions for a subscription. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListSuppressions.json
  */
+
+const { AdvisorManagementClient } = require("@azure/arm-advisor");
+const { DefaultAzureCredential } = require("@azure/identity");
+require("dotenv/config");
+
 async function listSuppressions() {
   const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId1";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.suppressions.list()) {
+  for await (const item of client.suppressions.list()) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
 async function main() {
-  listSuppressions();
+  await listSuppressions();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/README.md b/sdk/advisor/arm-advisor/samples/v3/typescript/README.md
index 1eb65331f827..624d216b19e1 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/README.md
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/README.md
@@ -59,10 +59,10 @@ npm run build
 node dist/configurationsCreateInResourceGroupSample.js
 ```
 
-Alternatively, run a single sample with the correct environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
+Alternatively, run a single sample with the required environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
 
 ```bash
-cross-env ADVISOR_SUBSCRIPTION_ID="<advisor subscription id>" node dist/configurationsCreateInResourceGroupSample.js
+npx cross-env ADVISOR_SUBSCRIPTION_ID="<advisor subscription id>" node dist/configurationsCreateInResourceGroupSample.js
 ```
 
 ## Next Steps
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/package.json b/sdk/advisor/arm-advisor/samples/v3/typescript/package.json
index 989b8e501718..a7878ddcd4ba 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/package.json
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/package.json
@@ -20,7 +20,8 @@
     "azure",
     "typescript",
     "browser",
-    "isomorphic"
+    "isomorphic",
+    "cloud"
   ],
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -31,11 +32,12 @@
   "dependencies": {
     "@azure/arm-advisor": "latest",
     "dotenv": "latest",
-    "@azure/identity": "^4.2.1"
+    "@azure/identity": "^4.13.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "typescript": "~5.8.2",
-    "rimraf": "latest"
+    "cross-env": "latest",
+    "rimraf": "latest",
+    "typescript": "~5.9.3"
   }
 }
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInResourceGroupSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInResourceGroupSample.ts
index e1b2b34759b1..fc278ed1cd34 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInResourceGroupSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInResourceGroupSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { ConfigData, AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Create/Overwrite Azure Advisor configuration.
@@ -17,9 +7,14 @@ dotenv.config();
  * @summary Create/Overwrite Azure Advisor configuration.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/CreateConfiguration.json
  */
-async function putConfigurations() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import type { ConfigData } from "@azure/arm-advisor";
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function putConfigurations(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const configurationName = "default";
   const resourceGroup = "resourceGroup";
   const configContract: ConfigData = {
@@ -33,28 +28,28 @@ async function putConfigurations() {
           "Security",
           "Performance",
           "Cost",
-          "OperationalExcellence"
+          "OperationalExcellence",
         ],
         frequency: 30,
         state: "Active",
-        language: "en"
-      }
+        language: "en",
+      },
     ],
     exclude: true,
-    lowCpuThreshold: "5"
+    lowCpuThreshold: "5",
   };
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const result = await client.configurations.createInResourceGroup(
     configurationName,
     resourceGroup,
-    configContract
+    configContract,
   );
   console.log(result);
 }
 
-async function main() {
-  putConfigurations();
+async function main(): Promise<void> {
+  await putConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInSubscriptionSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInSubscriptionSample.ts
index b84868d9d3c0..95861464107f 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInSubscriptionSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsCreateInSubscriptionSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { ConfigData, AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Create/Overwrite Azure Advisor configuration and also delete all configurations of contained resource groups.
@@ -17,9 +7,14 @@ dotenv.config();
  * @summary Create/Overwrite Azure Advisor configuration and also delete all configurations of contained resource groups.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/CreateConfiguration.json
  */
-async function putConfigurations() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import type { ConfigData } from "@azure/arm-advisor";
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function putConfigurations(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const configurationName = "default";
   const configContract: ConfigData = {
     digests: [
@@ -32,27 +27,27 @@ async function putConfigurations() {
           "Security",
           "Performance",
           "Cost",
-          "OperationalExcellence"
+          "OperationalExcellence",
         ],
         frequency: 30,
         state: "Active",
-        language: "en"
-      }
+        language: "en",
+      },
     ],
     exclude: true,
-    lowCpuThreshold: "5"
+    lowCpuThreshold: "5",
   };
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const result = await client.configurations.createInSubscription(
     configurationName,
-    configContract
+    configContract,
   );
   console.log(result);
 }
 
-async function main() {
-  putConfigurations();
+async function main(): Promise<void> {
+  await putConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListByResourceGroupSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListByResourceGroupSample.ts
index 9af2a18cb0ff..98026af59bc3 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListByResourceGroupSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListByResourceGroupSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Retrieve Azure Advisor configurations.
@@ -17,23 +7,25 @@ dotenv.config();
  * @summary Retrieve Azure Advisor configurations.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListConfigurations.json
  */
-async function getConfigurations() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getConfigurations(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const resourceGroup = "resourceGroup";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.configurations.listByResourceGroup(
-    resourceGroup
-  )) {
+  for await (const item of client.configurations.listByResourceGroup(resourceGroup)) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
-async function main() {
-  getConfigurations();
+async function main(): Promise<void> {
+  await getConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListBySubscriptionSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListBySubscriptionSample.ts
index 233ffc1cf673..12894bbb635c 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListBySubscriptionSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/configurationsListBySubscriptionSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Retrieve Azure Advisor configurations and also retrieve configurations of contained resource groups.
@@ -17,20 +7,24 @@ dotenv.config();
  * @summary Retrieve Azure Advisor configurations and also retrieve configurations of contained resource groups.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListConfigurations.json
  */
-async function getConfigurations() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getConfigurations(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.configurations.listBySubscription()) {
+  for await (const item of client.configurations.listBySubscription()) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
-async function main() {
-  getConfigurations();
+async function main(): Promise<void> {
+  await getConfigurations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataGetSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataGetSample.ts
index 4474163217ef..9468dec3c134 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataGetSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataGetSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Gets the metadata entity.
@@ -17,7 +7,12 @@ dotenv.config();
  * @summary Gets the metadata entity.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetRecommendationMetadataEntity.json
  */
-async function getMetadata() {
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getMetadata(): Promise<void> {
   const name = "types";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential);
@@ -25,8 +20,8 @@ async function getMetadata() {
   console.log(result);
 }
 
-async function main() {
-  getMetadata();
+async function main(): Promise<void> {
+  await getMetadata();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataListSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataListSample.ts
index 36de06add024..30c63c68767d 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataListSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationMetadataListSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Gets the list of metadata entities.
@@ -17,18 +7,23 @@ dotenv.config();
  * @summary Gets the list of metadata entities.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListRecommendationMetadata.json
  */
-async function getMetadata() {
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getMetadata(): Promise<void> {
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential);
   const resArray = new Array();
-  for await (let item of client.recommendationMetadata.list()) {
+  for await (const item of client.recommendationMetadata.list()) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
-async function main() {
-  getMetadata();
+async function main(): Promise<void> {
+  await getMetadata();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGenerateSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGenerateSample.ts
index 59677260ba72..52e07c21dae4 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGenerateSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGenerateSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Initiates the recommendation generation or computation process for a subscription. This operation is asynchronous. The generated recommendations are stored in a cache in the Advisor service.
@@ -17,17 +7,21 @@ dotenv.config();
  * @summary Initiates the recommendation generation or computation process for a subscription. This operation is asynchronous. The generated recommendations are stored in a cache in the Advisor service.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GenerateRecommendations.json
  */
-async function generateRecommendations() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function generateRecommendations(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const result = await client.recommendations.generate();
   console.log(result);
 }
 
-async function main() {
-  generateRecommendations();
+async function main(): Promise<void> {
+  await generateRecommendations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetGenerateStatusSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetGenerateStatusSample.ts
index 416d34a5b36f..52b5892d43e3 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetGenerateStatusSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetGenerateStatusSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Retrieves the status of the recommendation computation or generation process. Invoke this API after calling the generation recommendation. The URI of this API is returned in the Location field of the response header.
@@ -17,9 +7,13 @@ dotenv.config();
  * @summary Retrieves the status of the recommendation computation or generation process. Invoke this API after calling the generation recommendation. The URI of this API is returned in the Location field of the response header.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/EmptyResponse.json
  */
-async function getGenerateStatus() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getGenerateStatus(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const operationId = "operationGUID";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
@@ -27,8 +21,8 @@ async function getGenerateStatus() {
   console.log(result);
 }
 
-async function main() {
-  getGenerateStatus();
+async function main(): Promise<void> {
+  await getGenerateStatus();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetSample.ts
index a95175020f9c..943c8ccc85cf 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsGetSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Obtains details of a cached recommendation.
@@ -17,20 +7,22 @@ dotenv.config();
  * @summary Obtains details of a cached recommendation.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetRecommendationDetail.json
  */
-async function getRecommendationDetail() {
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getRecommendationDetail(): Promise<void> {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential);
-  const result = await client.recommendations.get(
-    resourceUri,
-    recommendationId
-  );
+  const result = await client.recommendations.get(resourceUri, recommendationId);
   console.log(result);
 }
 
-async function main() {
-  getRecommendationDetail();
+async function main(): Promise<void> {
+  await getRecommendationDetail();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsListSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsListSample.ts
index 8425536a7b68..0622d6c59e59 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsListSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/recommendationsListSample.ts
@@ -1,18 +1,5 @@
-/*
- * 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 {
-  RecommendationsListOptionalParams,
-  AdvisorManagementClient
-} from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Obtains cached recommendations for a subscription. The recommendations are generated or computed by invoking generateRecommendations.
@@ -20,22 +7,27 @@ dotenv.config();
  * @summary Obtains cached recommendations for a subscription. The recommendations are generated or computed by invoking generateRecommendations.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListRecommendations.json
  */
-async function listRecommendations() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
+
+import type { RecommendationsListOptionalParams } from "@azure/arm-advisor";
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function listRecommendations(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId";
   const top = 10;
   const options: RecommendationsListOptionalParams = { top };
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.recommendations.list(options)) {
+  for await (const item of client.recommendations.list(options)) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
-async function main() {
-  listRecommendations();
+async function main(): Promise<void> {
+  await listRecommendations();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsCreateSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsCreateSample.ts
index 012dc2877294..511dc6b4ac7f 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsCreateSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsCreateSample.ts
@@ -1,18 +1,5 @@
-/*
- * 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 {
-  SuppressionContract,
-  AdvisorManagementClient
-} from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Enables the snoozed or dismissed attribute of a recommendation. The snoozed or dismissed attribute is referred to as a suppression. Use this API to create or update the snoozed or dismissed status of a recommendation.
@@ -20,7 +7,13 @@ dotenv.config();
  * @summary Enables the snoozed or dismissed attribute of a recommendation. The snoozed or dismissed attribute is referred to as a suppression. Use this API to create or update the snoozed or dismissed status of a recommendation.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/CreateSuppression.json
  */
-async function createSuppression() {
+
+import type { SuppressionContract } from "@azure/arm-advisor";
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function createSuppression(): Promise<void> {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
   const name = "suppressionName1";
@@ -31,13 +24,13 @@ async function createSuppression() {
     resourceUri,
     recommendationId,
     name,
-    suppressionContract
+    suppressionContract,
   );
   console.log(result);
 }
 
-async function main() {
-  createSuppression();
+async function main(): Promise<void> {
+  await createSuppression();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsDeleteSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsDeleteSample.ts
index 5320115e9749..f1f1dac4ba01 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsDeleteSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsDeleteSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Enables the activation of a snoozed or dismissed recommendation. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
@@ -17,22 +7,23 @@ dotenv.config();
  * @summary Enables the activation of a snoozed or dismissed recommendation. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/DeleteSuppression.json
  */
-async function deleteSuppression() {
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function deleteSuppression(): Promise<void> {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
   const name = "suppressionName1";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential);
-  const result = await client.suppressions.delete(
-    resourceUri,
-    recommendationId,
-    name
-  );
+  const result = await client.suppressions.delete(resourceUri, recommendationId, name);
   console.log(result);
 }
 
-async function main() {
-  deleteSuppression();
+async function main(): Promise<void> {
+  await deleteSuppression();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsGetSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsGetSample.ts
index 1b5409a70003..4cbacea8f635 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsGetSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsGetSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Obtains the details of a suppression.
@@ -17,22 +7,23 @@ dotenv.config();
  * @summary Obtains the details of a suppression.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/GetSuppressionDetail.json
  */
-async function getSuppressionDetail() {
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function getSuppressionDetail(): Promise<void> {
   const resourceUri = "resourceUri";
   const recommendationId = "recommendationId";
   const name = "suppressionName1";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential);
-  const result = await client.suppressions.get(
-    resourceUri,
-    recommendationId,
-    name
-  );
+  const result = await client.suppressions.get(resourceUri, recommendationId, name);
   console.log(result);
 }
 
-async function main() {
-  getSuppressionDetail();
+async function main(): Promise<void> {
+  await getSuppressionDetail();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsListSample.ts b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsListSample.ts
index afaec3f03a89..5ae2e9ab0460 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsListSample.ts
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/src/suppressionsListSample.ts
@@ -1,15 +1,5 @@
-/*
- * 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 { AdvisorManagementClient } from "@azure/arm-advisor";
-import { DefaultAzureCredential } from "@azure/identity";
-import * as dotenv from "dotenv";
-
-dotenv.config();
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 /**
  * This sample demonstrates how to Retrieves the list of snoozed or dismissed suppressions for a subscription. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
@@ -17,20 +7,24 @@ dotenv.config();
  * @summary Retrieves the list of snoozed or dismissed suppressions for a subscription. The snoozed or dismissed attribute of a recommendation is referred to as a suppression.
  * x-ms-original-file: specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/examples/ListSuppressions.json
  */
-async function listSuppressions() {
-  const subscriptionId =
-    process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId1";
+
+import { AdvisorManagementClient } from "@azure/arm-advisor";
+import { DefaultAzureCredential } from "@azure/identity";
+import "dotenv/config";
+
+async function listSuppressions(): Promise<void> {
+  const subscriptionId = process.env["ADVISOR_SUBSCRIPTION_ID"] || "subscriptionId1";
   const credential = new DefaultAzureCredential();
   const client = new AdvisorManagementClient(credential, subscriptionId);
   const resArray = new Array();
-  for await (let item of client.suppressions.list()) {
+  for await (const item of client.suppressions.list()) {
     resArray.push(item);
   }
   console.log(resArray);
 }
 
-async function main() {
-  listSuppressions();
+async function main(): Promise<void> {
+  await listSuppressions();
 }
 
 main().catch(console.error);
diff --git a/sdk/advisor/arm-advisor/samples/v3/typescript/tsconfig.json b/sdk/advisor/arm-advisor/samples/v3/typescript/tsconfig.json
index 984eed535aa8..400db87cf648 100644
--- a/sdk/advisor/arm-advisor/samples/v3/typescript/tsconfig.json
+++ b/sdk/advisor/arm-advisor/samples/v3/typescript/tsconfig.json
@@ -1,17 +1,20 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2023",
     "module": "commonjs",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
+    "lib": [],
+    "importHelpers": true,
     "strict": true,
-    "alwaysStrict": true,
-    "outDir": "dist",
-    "rootDir": "src"
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "moduleResolution": "node10",
+    "esModuleInterop": true,
+    "outDir": "./dist",
+    "resolveJsonModule": true
   },
   "include": [
-    "src/**/*.ts"
+    "./src"
   ]
 }