Merge branch 'master' into vikas0212git-patch-1

microsoft · Oct 6, 2021 · 2ba87a3 · 2ba87a3
2 parents 8c3adb2 + efff19c
commit 2ba87a3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,10 @@
 
 ![Added](images/multipleplatform.gif)
 
+## What's New (v1.25.0)
+* Generate Dev Container definition files with new Edge Solutions.
+* Ability to add Dev Container definition files to existing Edge Solutions.
+
 ## What's New (v1.22.0)
 ### Changed
 * Allow user to select deployment template when add module

diff --git a/assets/containers/CSharp/.devcontainer/Dockerfile b/assets/containers/CSharp/.devcontainer/Dockerfile
@@ -6,7 +6,7 @@ COPY library-scripts/*.sh /tmp/library-scripts/
 RUN \
     apt-get update -y \
     # Use Docker script from script library to set things up - enable non-root docker, user vscode, using moby
-    && /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh "true" "vscode" "true" \
+    && /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh "true" "automatic" "true" \
     # install iotedgehubdev
     && apt-get install -y python3-pip && pip3 install iotedgehubdev \
     # Clean up

diff --git a/src/common/constants.ts b/src/common/constants.ts
@@ -50,6 +50,8 @@ export class Constants {
     public static CHOICE_REPLACE_DECRIPTION = "Replace existing Dev Container definitions";
     public static CHOICE_KEEP = "Keep";
     public static CHOICE_KEEP_DECRIPTION = "Keep existing Dev Container definitions";
+    public static CHOICE_YES = "Yes";
+    public static CHOICE_NO = "No";
     public static LANGUAGE_CSHARP = "C# Module";
     public static LANGUAGE_NODE = "Node.js Module";
     public static LANGUAGE_PYTHON = "Python Module";
@@ -241,6 +243,7 @@ export class Constants {
 
     public static canOnlyUseWithEdgeSolution = "This option is only available when an Azure IoT EdgeSolution is open.";
     public static containerDefinitionIsPresent = "This solution currently uses a Dev Container";
+    public static reloadInDevContainer = "Reload Workspace in Dev Container";
 
     public static openSampleEvent = "openSample";
     public static openSampleUrlEvent = "openSampleUrl";

diff --git a/src/edge/edgeManager.ts b/src/edge/edgeManager.ts
@@ -315,7 +315,7 @@ export class EdgeManager {
         const workspaceFolder = defaultFolder.fsPath;
         const dotDevContainer = path.join(workspaceFolder, Constants.dotDevContainer);
         if (await fse.pathExists(dotDevContainer)) {
-            const templatePicks: vscode.QuickPickItem[] = [
+            const replaceDontReplace: vscode.QuickPickItem[] = [
                 {
                     label: Constants.CHOICE_REPLACE,
                     description: Constants.CHOICE_REPLACE_DECRIPTION,
@@ -325,7 +325,7 @@ export class EdgeManager {
                     description: Constants.CHOICE_KEEP_DECRIPTION,
                 },
             ];
-            const doYouWishToOverride = await vscode.window.showQuickPick(templatePicks, { placeHolder: Constants.containerDefinitionIsPresent, ignoreFocusOut: true });
+            const doYouWishToOverride = await vscode.window.showQuickPick(replaceDontReplace, { placeHolder: Constants.containerDefinitionIsPresent, ignoreFocusOut: true });
             if (!doYouWishToOverride) {
                 throw new UserCancelledError();
             }
@@ -338,7 +338,20 @@ export class EdgeManager {
         const selection = await this.selectDevContainerKind();
         if (selection) {
             await this.generateDevContainerDirectory(selection, workspaceFolder);
-            await vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(workspaceFolder), false);
+            const reloadDontReload: vscode.QuickPickItem[] = [
+                {
+                    label: Constants.CHOICE_YES,
+                    description: "",
+                },
+                {
+                    label: Constants.CHOICE_NO,
+                    description: "",
+                },
+            ];
+            const doYouWishToReload = await vscode.window.showQuickPick(reloadDontReload, { placeHolder: Constants.reloadInDevContainer, ignoreFocusOut: true });
+            if (doYouWishToReload && doYouWishToReload.label === Constants.CHOICE_YES) {
+                await vscode.commands.executeCommand("remote-containers.reopenInContainer", vscode.Uri.file(workspaceFolder), false);
+            }
         }
     }