Merge branch 'master' into feature/southworks/fix-botskills-list-retr…

…ocompat

docs/_docs/skills/handbook/add-skills-to-a-virtual-assistant.md

@@ -47,7 +47,7 @@ See the [Skills Overview]({{site.baseurl}}/overview/skills) section for details
 Run the following command to add each Skill to your Virtual Assistant. This assumes you are running the CLI within the project directory and have created your Bot through the template and therefore have a `appsettings.json` file present in the working folder.
 
 ```bash
-botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
+botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 The `--luisFolder` parameter can be used to point the Skill CLI at the source LU files for trigger utterances. For Skills provided within this repo these can be found in the `Deployment/Resources/LU` folder of each Skill. The CLI will automatically traverse locale folder hierarchies. This can be omitted for any of the skills we provide as the LU files are provided locally. Also, you have to specify the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration.
@@ -89,7 +89,7 @@ To update a Skill to your assistant/Bot we provide a `botskills` command line to
 Run the following command to update a Skill to your Virtual Assistant. This assumes you are running the CLI within the project directory and have created your Bot through the template and therefore have a `appsettings.json` file present in the working folder.
 
 ```bash
-botskills update --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
+botskills update --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 The `--luisFolder` parameter can be used to point the Skill CLI at the source LU files for trigger utterances. For Skills provided within this repo these can be found in the `Deployment/Resources/LU` folder of each Skill. The CLI will automatically traverse locale folder hierarchies. This can be omitted for any of the skills we provide as the LU files are provided locally. Also, you have to specify the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration.

docs/_docs/skills/handbook/botskills.md

@@ -32,7 +32,7 @@ The CLI performs the following operations on your behalf:
     ```
 
 ## Commands
-For all of this commands, the tool assumes that you are running the CLI within the **Virtual Assistant project directory** and have created your Bot through the template, and therefore have a `skills.json` file present in the working folder which contains the connected skills.
+For all of this commands, the tool assumes that you are running the CLI within the **Virtual Assistant project directory** and have created your Bot through the template.
 
 ### Connect Skills
 {:.no_toc}
@@ -41,7 +41,7 @@ The `connect` command allows you to connect a Skill, be it local or remote, to y
 
 Here is an example:
 ```bash
-botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
+botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 *Remember to re-publish your Assistant to Azure after you've added a Skill unless you plan on testing locally only*
@@ -82,7 +82,7 @@ The `update` command allows you to update a Skill, be it local or remote, to you
 
 Here is an example:
 ```bash
-botskills update --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
+botskills update --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 For further information, see the [Update command documentation]({{site.repo}}/tree/master/tools/botskills/docs/commands/update.md).

docs/_docs/skills/handbook/multilanguage-functionality.md

@@ -38,7 +38,7 @@ In this case, the intersection between the `Dispatch models` and the `languages
 Taking into account the scenario mentioned, we will connect the `en-us` and `es-es` languages of the Skill to the Virtual Assistant
 
 ```bash
-botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --languages "en-us,es-es"
+botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --languages "en-us,es-es" --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 > Since `--languages` is an optional argument, it will connect `en-us` by default, unless we pass a value to the argument.

docs/_docs/skills/tutorials/add-prebuilt-skill/4-connect-skill.md

@@ -17,7 +17,7 @@ To add your new Skill to your assistant/Bot we provide a [botskills](https://www
 Run the following command from a command prompt **within the directory of your assistant/Bot**. 
 
 ```bash
-botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
+botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 **Remember to re-publish your Assistant to Azure after you've added a Skill unless you plan on testing locally only**

docs/_docs/skills/tutorials/create-skill/csharp/7-add-your-skill.md

@@ -22,7 +22,7 @@ To add your new Skill to your assistant we provide the [botskills](https://www.n
 Run the following command from a command prompt **within the directory of your assistant/Bot**. 
 
 ```bash
-botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --cs
+botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 Remember to re-publish your assistant to Azure after you’ve added a Skill unless you plan on testing locally only.
 

docs/_docs/skills/tutorials/create-skill/typescript/7-add-your-skill.md

@@ -22,7 +22,7 @@ To add your new Skill to your assistant we provide the [botskills](https://www.n
 Run the following command from a command prompt **within the directory of your assistant/Bot**. 
 
 ```bash
-botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --ts
+botskills connect --remoteManifest "https://<YOUR_SKILL_NAME>.azurewebsites.net/manifest/manifest-1.1.json" --ts --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 Remember to re-publish your assistant to Azure after you’ve added a Skill unless you plan on testing locally only.
 

docs/_docs/virtual-assistant/handbook/devops.md

@@ -70,7 +70,7 @@ Once you have updated your manifest, follow these steps to update any Virtual As
 1. Run the following command from your project directory:
 
 ```node
-botskills update --remoteManifest "http://<YOUR_SKILL_MANIFEST>.azurewebsites.net/api/skill/manifest" --cs
+botskills update --remoteManifest "http://<YOUR_SKILL_MANIFEST>.azurewebsites.net/api/skill/manifest" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 > This command updates the botFrameworkSkills property of your appsettings.json file with the latest manifest definitions for each connected skill, and runs dispatch refresh to update your dispatch model.

sdk/typescript/libraries/bot-solutions/tsconfig.json

@@ -21,7 +21,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
+    // "strict": true,                        /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */

templates/typescript/generator-bot-virtualassistant/generators/app/templates/sample-assistant/tsconfig.json

@@ -21,7 +21,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
+    // "strict": true,                        /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */

templates/typescript/generator-bot-virtualassistant/generators/skill/templates/sample-skill/tsconfig.json

@@ -21,7 +21,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
+    // "strict": true,                        /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */

templates/typescript/samples/sample-assistant/tsconfig.json

@@ -21,7 +21,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
+    // "strict": true,                        /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */

templates/typescript/samples/sample-skill/tsconfig.json

@@ -21,7 +21,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
+    // "strict": true,                        /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */

tools/botskills/docs/commands/connect.md

@@ -64,13 +64,13 @@ For Skills that require other Authentication connection configuration please fol
 An example on how to use it with a local Skill manifest file:
 
 ```bash
-botskills connect --localManifest "./skills/customSkill/customSkillManifest.json" --cs
+botskills connect --localManifest "./skills/customSkill/customSkillManifest.json" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 > **Note:** The paths to the Skill Manifest can be relative or absolute paths equally, and should be explicitly a `.json` file.
 
 An example on how to use it with a remote Skill manifest:
 
 ```bash
-botskills connect --remoteManifest "http://<YOUR_SKILL_MANIFEST>.azurewebsites.net/api/skill/manifest" --cs
+botskills connect --remoteManifest "http://<YOUR_SKILL_MANIFEST>.azurewebsites.net/api/skill/manifest" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```

tools/botskills/docs/commands/update.md

@@ -34,13 +34,13 @@ botskills update [options]
 An example on how to use it with a local Skill manifest file:
 
 ```bash
-botskills update --localManifest "./skills/customSkill/customSkillManifest.json" --cs
+botskills update --localManifest "./skills/customSkill/customSkillManifest.json" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 > **Note:** The paths to the Skill Manifest can be relative or absolute paths equally, and should be explicitly a `.json` file.
 
 An example on how to use it with a remote Skill manifest:
 
 ```bash
-botskills update --remoteManifest "http://<YOUR_SKILL_MANIFEST>.azurewebsites.net/api/skill/manifest" --cs
+botskills update --remoteManifest "http://<YOUR_SKILL_MANIFEST>.azurewebsites.net/api/skill/manifest" --cs --luisFolder "<PATH_TO_LU_FOLDER>"
 ```

tools/botskills/docs/multilanguage-functionality.md

@@ -24,7 +24,7 @@ In this case, the intersection between the `Dispatch models` and the `languages
 Taking into account the scenario mentioned, we will connect the `en-us` and `es-es` languages of the Skill to the Virtual Assistant
 
 ```bash
-botskills connect --remoteManifest "http://<YOUR_SKILL_NAME>.azurewebsites.net/api/skill/manifest?inlineTriggerUtterances=false" --cs --languages "en-us,es-es"
+botskills connect --remoteManifest "http://<YOUR_SKILL_NAME>.azurewebsites.net/api/skill/manifest?inlineTriggerUtterances=false" --cs --languages "en-us,es-es" --luisFolder "<PATH_TO_LU_FOLDER>"
 ```
 
 > Since `--languages` is an optional argument, it will connect `en-us` by default, unless we pass a value to the argument.

tools/botskills/src/functionality/connectSkill.ts

@@ -125,7 +125,7 @@ Make sure your Skill's .lu file's name matches your Skill's manifest id`);
         executionModelMap.set('luisApp', luisApp);
         executionModelMap.set('luisFile', luisFile);
         executionModelMap.set('luisFilePath', luisFilePath);
-        executionModelMap.set('--in', wrapPathWithQuotes(luFilePath));
+        executionModelMap.set('--in', luFilePath);
         executionModelMap.set('--culture', culture);
         executionModelMap.set('--out', luisFilePath);
         executionModelMap.set('--type', 'file');
@@ -206,7 +206,7 @@ Make sure you have a Dispatch for the cultures you are trying to connect, and th
             const luisConvertCommandArguments: string[] = ['--in', '--culture', '--out', '--name'];
             luisConvertCommandArguments.forEach((argument: string): void => {
                 const argumentValue: string = executionModelByCulture.get(argument) as string;
-                luisConvertCommand.push(...[argument, argumentValue]);
+                luisConvertCommand.push(...[argument, wrapPathWithQuotes(argumentValue)]);
             });
             await this.runCommand(luisConvertCommand, `Parsing ${ culture } ${ luisApp } LU file`);
             if (!existsSync(luisFilePath)) {

tools/botskills/src/functionality/refreshSkill.ts

@@ -69,7 +69,7 @@ export class RefreshSkill {
             ];
             luisGenerateCommandArguments.forEach((argument: string): void => {
                 const argumentValue: string = executionModelByCulture.get(argument) as string;
-                luisGenerateCommand.push(...[argument, argumentValue]);
+                luisGenerateCommand.push(...[argument, wrapPathWithQuotes(argumentValue)]);
             });
 
             // Force the bf luis:generate to overwrite the output file if it already exists
@@ -98,8 +98,8 @@ Remember to use the argument '--dispatchFolder' for your Assistant's Dispatch fo
         executionModelMap.set('dispatchJsonFilePath', dispatchJsonFilePath);
         executionModelMap.set('--dispatch', dispatchFilePath);
         executionModelMap.set('--dataFolder', dataFolder);
-        executionModelMap.set('--in', wrapPathWithQuotes(dispatchJsonFilePath));
-        executionModelMap.set('--out', wrapPathWithQuotes(this.configuration.lgOutFolder));
+        executionModelMap.set('--in', dispatchJsonFilePath);
+        executionModelMap.set('--out', this.configuration.lgOutFolder);
         executionModelMap.set('--className', 'DispatchLuis');
 
         return executionModelMap;