Skip to content

Commit

Permalink
Fixes error when creating a new solution with external modules (#626)
Browse files Browse the repository at this point in the history
  • Loading branch information
mhshami01 authored Jan 27, 2022
1 parent 878e48f commit ea78361
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 86 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Change Log
## 1.25.6 - 2022-01-28
### Changed
* Fixed issue with Dev Container generation for External module sources
* Updated extension dependency list to include VSCode Remote Containers extension

## 1.25.5 - 2022-01-20
### Changed
* Added dependent extensions to Dev Container definitions.
Expand Down
144 changes: 62 additions & 82 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.5",
"version": "1.25.6",
"publisher": "vsciot-vscode",
"aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
"icon": "logo.png",
Expand Down Expand Up @@ -588,6 +588,7 @@
},
"extensionDependencies": [
"ms-vscode.azure-account",
"ms-vscode-remote.remote-containers",
"vsciot-vscode.azure-iot-toolkit"
]
}
12 changes: 9 additions & 3 deletions src/edge/edgeManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -998,10 +998,16 @@ export class EdgeManager {
containerSource = path.join(sourceContainersPath, Constants.CONTAINER_PYTHON);
break;
default:
throw new Error("Language '" + template + "' is not supported.");
// if we are on path 1, we don't define a dev container since the language
// choice is not known nor is it relevant.
vscode.window.showInformationMessage("New module for '" + template + "'");
}

if (containerSource.length > 0)
{
await fse.copy(containerSource, slnPath, { overwrite : true });
await fse.copy(sourceLibrayScriptsPath, path.join(slnPath, Constants.dotDevContainer, Constants.libraryScriptsFolder));
}
await fse.copy(containerSource, slnPath, { overwrite : true });
await fse.copy(sourceLibrayScriptsPath, path.join(slnPath, Constants.dotDevContainer, Constants.libraryScriptsFolder));
}

private async selectDevContainerKind(label?: string, isNewSolution: boolean = false): Promise<string> {
Expand Down

0 comments on commit ea78361

Please sign in to comment.