From 4d26a795e8f7526336d480a5426c5c9bbe0624be Mon Sep 17 00:00:00 2001 From: Haitham Shami Date: Tue, 30 Nov 2021 16:04:56 -0800 Subject: [PATCH] add missing case for dev container creation (#620) * Add missing case for dev container creation * Update version number --- CHANGELOG.md | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- src/edge/edgeManager.ts | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index beddfc0a..824a5ded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Change Log +## 1.25.3 - 2021-11-30 +### Changed +* Added creation of CSharp Dev Container for new Solutions with a CSharp Function. + ## 1.25.2 - 2021-11-30 ### Changed * Update npm package dependencies diff --git a/package-lock.json b/package-lock.json index ebe05bf4..b6720b20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "azure-iot-edge", - "version": "1.25.2", + "version": "1.25.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "azure-iot-edge", - "version": "1.25.2", + "version": "1.25.3", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@azure/arm-containerregistry": "^8.1.1", diff --git a/package.json b/package.json index 5e6a0340..00f7e9da 100644 --- 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.2", + "version": "1.25.3", "publisher": "vsciot-vscode", "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe", "icon": "logo.png", diff --git a/src/edge/edgeManager.ts b/src/edge/edgeManager.ts index d4cbaba2..7c3f227a 100644 --- a/src/edge/edgeManager.ts +++ b/src/edge/edgeManager.ts @@ -974,13 +974,14 @@ export class EdgeManager { let containerSource = ""; switch (template) { // we get here from two different paths: - // 1- when creating a new edge solution and the first add module is called - // 2- when working with an existing solution and the use wishes to use a dev container + // 1- when creating a new edge solution and the first add module is called, or + // 2- when working with an existing solution and the user wishes to incorporate a dev container case Constants.LANGUAGE_C: case Constants.CONTAINER_C: containerSource = path.join(sourceContainersPath, Constants.CONTAINER_C); break; case Constants.LANGUAGE_CSHARP: + case Constants.CSHARP_FUNCTION: case Constants.CONTAINER_CSHARP: containerSource = path.join(sourceContainersPath, Constants.CONTAINER_CSHARP); break;