Fix

Author: devdotnetorg

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## v0.3.3 (24-04-2023)
+## v0.3.3 (28-04-2023)
 
 - Added parameter `fastiot.template.community.updatesource`, update source for community project templates. Adds the ability to download templates from third-party resources.
 - Added the default selection of the "Projects" folder for placing projects, the parameter `fastiot.template.defaultprojectfolder`.

CHANGELOG_ru.md

@@ -1,6 +1,6 @@
 # Список изменений
 
-## v0.3.3 (24-04-2023)
+## v0.3.3 (28-04-2023)
 
 - Добавлен параметр `fastiot.template.community.updatesource`, источник обновления для community шаблонов проектов. Добавляет возможность загружать шаблоны со сторонних ресурсов.
 - Добавлен по умолчанию выбор папки "Projects" для размещения проектов, параметр `fastiot.template.defaultprojectfolder`.

docs/Project-templates.md

@@ -208,7 +208,7 @@ Variables:
 21. "%{project.dotnet.namespace}" => "DotnetConsoleAppRuntimeInfo".
 22. "%{device.dotnet.rid}" => "linux-arm".
 23. "%{launch.label}" => "Launch on cubieboard (DotnetConsoleAppRuntimeInfo, Cubieboard, debugvscode)".
-24. "%{extension.apps.builtin.aswindows}" => "d:\\\\Anton\\\\GitHub\\\\vscode-extension-dotnet-fastiot\\\\windows\\\\apps".
+24. "%{extension.apps.builtin.aswindows}" => "c:\\\\Users\\\\Anton\\\\.vscode\\\\extensions\\\\devdotnetorg.vscode-extension-dotnet-fastiot-0.3.3\\\\windows\\\\apps".
 25. "%{os.userinfo.username}" => "Anton".
 
 **Values when there are directories in the path**

docs/Project-templates_ru.md

@@ -209,7 +209,7 @@
 21. "%{project.dotnet.namespace}" => "DotnetConsoleAppRuntimeInfo".
 22. "%{device.dotnet.rid}" => "linux-arm".
 23. "%{launch.label}" => "Launch on cubieboard (DotnetConsoleAppRuntimeInfo, Cubieboard, debugvscode)".
-24. "%{extension.apps.builtin.aswindows}" => "d:\\\\Anton\\\\GitHub\\\\vscode-extension-dotnet-fastiot\\\\windows\\\\apps".
+24. "%{extension.apps.builtin.aswindows}" => "c:\\\\Users\\\\Anton\\\\.vscode\\\\extensions\\\\devdotnetorg.vscode-extension-dotnet-fastiot-0.3.3\\\\windows\\\\apps".
 25. "%{os.userinfo.username}" => "Anton".
 
 **Значения при наличии каталогов в пути**

package.json

@@ -86,7 +86,6 @@
 							"ecdsa-256",
 							"ecdsa-384",
 							"ecdsa-521",
-							"dsa-1024",
 							"rsa-1024",
 							"rsa-2048",
 							"rsa-3072",

src/Entity/EntityCollection.ts

@@ -207,7 +207,7 @@ export abstract class EntityCollection <A extends EntityBaseAttribute, T extends
     if((this.Count-entitysCountBegin)>0) {
       result= new IotResult(StatusResult.Ok,`Loading ${type} ${this._entityIntLabel}s from ${pathFolder} folder successfully completed`);
     }else{
-      result= new IotResult(StatusResult.None,`No ${type} ${this._entityIntLabel} was loaded from the ${pathFolder} folder`);
+      result= new IotResult(StatusResult.Ok,`No ${type} ${this._entityIntLabel} was loaded from the ${pathFolder} folder`);
     }
     return Promise.resolve(result);
   }

src/IotDevice.ts

@@ -313,6 +313,8 @@ export class IotDevice extends BaseTreeItem {
         };
     }else{
       sshconfig=this.Account.SshConfig;
+      if(this.Account.SshConfig.port) 
+        port=this.Account.SshConfig.port;
     }
     //Trubleshooting text
     const trubleshootingText=
@@ -327,7 +329,7 @@ export class IotDevice extends BaseTreeItem {
         `Checklist:\n`+
         `❌ IP-Address defined;\n`+
         `❌ Host availability. Command: "ping";\n`+
-        `❌ Port 22 availability;\n`+
+        `❌ Port ${port} availability;\n`+
         `❌ Authorization via ssh protocol.\n`+
         `${trubleshootingText}`);
       return Promise.resolve(result);}
@@ -339,18 +341,18 @@ export class IotDevice extends BaseTreeItem {
         `Checklist:\n`+
         `✔️ IP-Address defined;\n`+
         `❌ Host availability. Command: "ping";\n`+
-        `❌ Port 22 availability;\n`+
+        `❌ Port ${port} availability;\n`+
         `❌ Authorization via ssh protocol.\n`+
         `${trubleshootingText}`);
       return Promise.resolve(result);}
     //Check port
-    result=await networkHelper.CheckTcpPortUsed(ipAddress,sshconfig.port ?? 22);
+    result=await networkHelper.CheckTcpPortUsed(ipAddress,sshconfig.port ?? port);
     if(result.Status==StatusResult.Error) {
       result.AddMessage(
         `Checklist:\n`+
         `✔️ IP-Address defined;\n`+
         `✔️ Host availability. Command: "ping";\n`+
-        `❌ Port 22 availability;\n`+
+        `❌ Port ${port} availability;\n`+
         `❌ Authorization via ssh protocol.\n`+
         `${trubleshootingText}`);
       return Promise.resolve(result);}
@@ -362,7 +364,7 @@ export class IotDevice extends BaseTreeItem {
         `Checklist:\n`+
         `✔️ IP-Address defined;\n`+
         `✔️ Host availability. Command: "ping";\n`+
-        `✔️ Port 22 availability;\n`+
+        `✔️ Port ${port} availability;\n`+
         `❌ Authorization via ssh protocol.\n`+
         `${trubleshootingText}`);
     } else {
@@ -371,7 +373,7 @@ export class IotDevice extends BaseTreeItem {
         `Checklist:\n`+
         `✔️ IP-Address defined;\n`+
         `✔️ Host availability. Command: "ping";\n`+
-        `✔️ Port 22 availability;\n`+
+        `✔️ Port ${port} availability;\n`+
         `✔️ Authorization via ssh protocol.`);
     }
     return Promise.resolve(result);

src/extension.ts

@@ -288,7 +288,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	});
 	//Reload templates
 	let commandReloadTemplates = vscode.commands.registerCommand('viewTemplates.ReloadTemplates', () => {	
-			loadTemplates(app);	
+			loadTemplates(app,true);	
 	});
 	//Open template folder
 	let commandOpenTemplateFolder = vscode.commands.registerCommand('viewTemplates.OpenTemplateFolder', () => {