Dev/hshami/fix extension dependency for dev containers (#625)

* Add missing extension dependencies * Update version * Update telemetry client package from deprecated * Update with PR Comments
microsoft · Jan 24, 2022 · 878e48f · 878e48f
1 parent a596548
commit 878e48f
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Change Log
+## 1.25.5 - 2022-01-20
+### Changed
+* Added dependent extensions to Dev Container definitions.
+
 ## 1.25.4 - 2021-12-15
 ### Changed
 * Replaced deprecated 'Request' with axios for http requests.

diff --git a/assets/containers/CSharp/.devcontainer/devcontainer.json b/assets/containers/CSharp/.devcontainer/devcontainer.json
@@ -25,6 +25,8 @@
     "extensions": [
         "ms-dotnettools.csharp",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 

diff --git a/assets/containers/Cpp/.devcontainer/devcontainer.json b/assets/containers/Cpp/.devcontainer/devcontainer.json
@@ -23,6 +23,8 @@
     "extensions": [
         "ms-vscode.cpptools",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 

diff --git a/assets/containers/Java/.devcontainer/devcontainer.json b/assets/containers/Java/.devcontainer/devcontainer.json
@@ -36,6 +36,8 @@
     "extensions": [
         "vscjava.vscode-java-pack",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 

diff --git a/assets/containers/Node/.devcontainer/devcontainer.json b/assets/containers/Node/.devcontainer/devcontainer.json
@@ -25,6 +25,8 @@
     "extensions": [
         "dbaeumer.vscode-eslint",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 

diff --git a/assets/containers/Python/.devcontainer/devcontainer.json b/assets/containers/Python/.devcontainer/devcontainer.json
@@ -46,6 +46,8 @@
         "ms-python.python",
         "ms-python.vscode-pylance",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Develop, deploy, debug, and manage your IoT Edge solution.",
-  "version": "1.25.4",
+  "version": "1.25.5",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",
@@ -584,7 +584,7 @@
     "strip-json-comments": "^2.0.1",
     "tmp": "0.0.33",
     "unzipper": "^0.10.5",
-    "vscode-extension-telemetry": "^0.4.2"
+    "@vscode/extension-telemetry": "^0.4.6"
   },
   "extensionDependencies": [
     "ms-vscode.azure-account",

diff --git a/src/common/telemetryClient.ts b/src/common/telemetryClient.ts
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 "use strict";
+import TelemetryReporter from "@vscode/extension-telemetry";
 import * as vscode from "vscode";
-import TelemetryReporter from "vscode-extension-telemetry";
 import { Constants } from "./constants";
 
 const packageJSON = vscode.extensions.getExtension(Constants.ExtensionId).packageJSON;