diff --git a/.gitignore b/.gitignore
index f5dec14e3d..e39e384a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -389,4 +389,6 @@ mochawesome-report
 # metrics
 .metrics
 
-package-lock.json
\ No newline at end of file
+package-lock.json
+
+.DS_Store
\ No newline at end of file
diff --git a/packages/fx-core/src/common/samples-config-v3.json b/packages/fx-core/src/common/samples-config-v3.json
index 998558d053..3ad950ab78 100644
--- a/packages/fx-core/src/common/samples-config-v3.json
+++ b/packages/fx-core/src/common/samples-config-v3.json
@@ -205,6 +205,16 @@
             "time": "10min to run",
             "configuration": "Manual configurations required",
             "suggested": false
-          }
+          },
+        {
+            "id": "live-share-diceroller-sample",
+            "title": "Get started with a diceroll sample introducing Live Share",
+            "shortDescription": "This sample introduces Microsoft Live Share and Azure Fluid Relay to enable a shared experience between multiple users.",
+            "fullDescription": "Microsoft Live Share is a collaboration tool that enables you to share your experience with others in real time. Azure Fluid Relay is a part of this service. The diceroller example is a simple app that allows multiple users to roll a dice and see the results. This sample is a great way to get started with Live Share and Fluid.",
+            "tags": ["Live Share", "JS", "ReactJS", "Teams-JS 2.0"],
+            "time": "5 min to run",
+            "configuration": "Manual configuration required",
+            "suggested": false
+        }
     ]
 }
\ No newline at end of file
diff --git a/packages/fx-core/src/common/samples-config.json b/packages/fx-core/src/common/samples-config.json
index f637982721..340a1c1006 100644
--- a/packages/fx-core/src/common/samples-config.json
+++ b/packages/fx-core/src/common/samples-config.json
@@ -196,6 +196,16 @@
             "time": "7min to run",
             "configuration": "Ready for debug",
             "suggested": false
+        },
+        {
+            "id": "live-share-dice-roller-sample",
+            "title": "Get started with a dice-roller sample introducing Live Share",
+            "shortDescription": "This sample introduces Microsoft Live Share and Azure Fluid Relay to enable a shared experience between multiple users.",
+            "fullDescription": "Microsoft Live Share is a collaboration tool that enables you to share your experience with others in real time. Azure Fluid Relay is a part of this service. The dice-roller example is a simple app that allows multiple users to roll a dice and see the results. This sample is a great way to get started with Live Share and Fluid.",
+            "tags": ["Live Share", "JS", "ReactJS", "Teams-JS 2.0"],
+            "time": "5 min to run",
+            "configuration": "Manual configuration required",
+            "suggested": false
         }
     ]
 }
\ No newline at end of file
diff --git a/packages/vscode-extension/.eslintignore b/packages/vscode-extension/.eslintignore
new file mode 100644
index 0000000000..515bcd4f57
--- /dev/null
+++ b/packages/vscode-extension/.eslintignore
@@ -0,0 +1,2 @@
+package.json
+package-lock.json
\ No newline at end of file
diff --git a/packages/vscode-extension/.eslintrc.js b/packages/vscode-extension/.eslintrc.js
index 91bfd84913..f53b5638fa 100644
--- a/packages/vscode-extension/.eslintrc.js
+++ b/packages/vscode-extension/.eslintrc.js
@@ -1,3 +1,11 @@
 module.exports = {
-  extends: ["../eslint-plugin-teamsfx/config/shared.js"],
+  extends: ["../eslint-config"],
+  rules: {
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "import/no-unresolved": "off",
+    "import/no-cycle": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "no-secrets/no-secrets": "off",
+  },
 };
diff --git a/packages/vscode-extension/img/webview/sample/live-share-dice-roller.gif b/packages/vscode-extension/img/webview/sample/live-share-dice-roller.gif
new file mode 100644
index 0000000000..76c9ccdf01
Binary files /dev/null and b/packages/vscode-extension/img/webview/sample/live-share-dice-roller.gif differ
diff --git a/packages/vscode-extension/src/controls/SampleGallery.tsx b/packages/vscode-extension/src/controls/SampleGallery.tsx
index bcf00f97f1..2fdd41277d 100644
--- a/packages/vscode-extension/src/controls/SampleGallery.tsx
+++ b/packages/vscode-extension/src/controls/SampleGallery.tsx
@@ -30,6 +30,7 @@ import DeepLinking from "../../img/webview/sample/deeplink-without-sso.gif";
 import DashboardTab from "../../img/webview/sample/team-central-dashboard.gif";
 import TeamsTabAndOutlookAddin from "../../img/webview/sample/hello-world-teams-tab-and-outlook-add-in.png";
 import DevAssistDashboard from "../../img/webview/sample/dev-assist-dashboard.png";
+import LiveShareDiceRoller from "../../img/webview/sample/live-share-dice-roller.gif"
 import {
   TelemetryEvent,
   TelemetryProperty,
@@ -61,6 +62,7 @@ const imageMapping: { [p: string]: any } = {
   "team-central-dashboard": DashboardTab,
   "hello-world-teams-tab-and-outlook-add-in": TeamsTabAndOutlookAddin,
   "dev-assist-dashboard": DevAssistDashboard,
+  "live-share-dice-roller":LiveShareDiceRoller,
 };
 
 export default class SampleGallery extends React.Component<any, any> {
diff --git a/packages/vscode-extension/src/debug/teamsfxDebugProvider.ts b/packages/vscode-extension/src/debug/teamsfxDebugProvider.ts
index 25e60319aa..c17b4ccca5 100644
--- a/packages/vscode-extension/src/debug/teamsfxDebugProvider.ts
+++ b/packages/vscode-extension/src/debug/teamsfxDebugProvider.ts
@@ -13,16 +13,13 @@ import { environmentManager } from "@microsoft/teamsfx-core/build/core/environme
 
 import VsCodeLogInstance from "../commonlib/log";
 import M365TokenInstance from "../commonlib/m365Login";
-import { getSystemInputs, showError } from "../handlers";
+import { getSystemInputs, showError, core } from "../handlers";
 import { TelemetryEvent, TelemetryProperty } from "../telemetry/extTelemetryEvents";
 import * as commonUtils from "./commonUtils";
 import { Host, Hub, sideloadingDisplayMessages } from "./constants";
 import { localTelemetryReporter, sendDebugAllEvent } from "./localTelemetryReporter";
 import { getTeamsAppInternalId, showInstallAppInTeamsMessage } from "./teamsAppInstallation";
 import { terminateAllRunningTeamsfxTasks } from "./teamsfxTaskHandler";
-import { core } from "../handlers";
-import { ExtensionSource } from "../error";
-import { UserError } from "@microsoft/teamsfx-api";
 
 export interface TeamsfxDebugConfiguration extends vscode.DebugConfiguration {
   teamsfxIsRemote?: boolean;