Merge pull request #3 from microsoft/master

pulling latest from upstream

Author: abiemann

docs/tutorials/csharp/virtualassistant.md

@@ -54,7 +54,7 @@ A Virtual Assistant app (in C#) that greets a new user.
    npm install -g botskills
    ```
 
-7. Download and install the [Azure Command Line Tools (CLI)](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-windows?view=azure-cli-latest).
+7. Download and install the [Azure Command Line Tools (CLI)](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-windows?view=azure-cli-latest) **(Version 2.0.64 minimum required)**.
 8. Download and install the [Bot Framework Emulator](https://aka.ms/botframework-emulator).
 
 ## Create your assistant

lib/csharp/microsoft.bot.builder.solutions/microsoft.bot.builder.solutions/Extensions/ActivityEx.cs

@@ -36,7 +36,7 @@ public static bool IsStartActivity(this Activity activity)
                         if (activity.Type == ActivityTypes.ConversationUpdate)
                         {
                             // When bot is added to the conversation (triggers start only once per conversation)
-                            if (activity.MembersAdded.Any(m => m.Id == activity.Recipient.Id))
+                            if (activity.MembersAdded != null && activity.MembersAdded.Any(m => m.Id == activity.Recipient.Id))
                             {
                                 return true;
                             }

lib/typescript/botskills/docs/connect-disconnect.md

@@ -68,6 +68,7 @@ botskills disconnect [option]
 | --ts                          | Determine your assistant project structure to be a TypeScript-like structure         
 | --noTrain                          | (OPTIONAL) Determine whether the skills connected are not going to be trained (by default they are trained)                                                                         |
 | --dispatchName [name]         | (OPTIONAL) Name of your assistant's '.dispatch' file (defaults to the name displayed in your Cognitive Models file)                                         |
+| --language [language]         | (OPTIONAL) Locale used for LUIS culture (defaults to 'en-us')                                                                                               |
 | --dispatchFolder [path]       | (OPTIONAL) Path to the folder containing your assistant's '.dispatch' file (defaults to './deployment/resources/dispatch/en' inside your assistant folder)  |
 | --outFolder [path]            | (OPTIONAL) Path for any output file that may be generated (defaults to your assistant's root folder)                                                        |
 | --lgOutFolder [path]          | (OPTIONAL) Path for the LuisGen output (defaults to a 'service' folder inside your assistant's folder)                                                      |

lib/typescript/botskills/src/botskills-disconnect.ts

@@ -36,6 +36,7 @@ program
     .option('--ts', 'Determine your assistant project structure to be a TypeScript-like structure')
     .option('--noTrain', '[OPTIONAL] Determine whether the skills connected are not going to be trained (by default they are trained)')
     .option('--dispatchName [name]', '[OPTIONAL] Name of your assistant\'s \'.dispatch\' file (defaults to the name displayed in your Cognitive Models file)')
+    .option('--language [language]', '[OPTIONAL] Locale used for LUIS culture (defaults to \'en-us\')')
     .option('--dispatchFolder [path]', '[OPTIONAL] Path to the folder containing your assistant\'s \'.dispatch\' file (defaults to \'./deployment/resources/dispatch/en\' inside your assistant folder)')
     .option('--outFolder [path]', '[OPTIONAL] Path for any output file that may be generated (defaults to your assistant\'s root folder)')
     .option('--lgOutFolder [path]', '[OPTIONAL] Path for the LuisGen output (defaults to a \'service\' folder inside your assistant\'s folder)')
@@ -113,9 +114,6 @@ const language: string = args.language || 'en-us';
 configuration.language = language;
 const languageCode: string = (language.split('-'))[0];
 
-// luisFolder validation
-configuration.luisFolder = args.luisFolder || join(configuration.outFolder, 'Deployment', 'Resources', 'Skills', languageCode);
-
 // dispatchFolder validation
 configuration.dispatchFolder = args.dispatchFolder || join(configuration.outFolder, 'Deployment', 'Resources', 'Dispatch', languageCode);
 

templates/Enterprise-Template/src/csharp/EnterpriseBotSample/EnterpriseBotSample/Extensions/ActivityExtensions.cs

@@ -32,7 +32,7 @@ public static bool IsStartActivity(this Activity activity)
                         if (activity.Type == ActivityTypes.ConversationUpdate)
                         {
                             // When bot is added to the conversation (triggers start only once per conversation)
-                            if (activity.MembersAdded.Any(m => m.Id == activity.Recipient.Id))
+                            if (activity.MembersAdded != null && activity.MembersAdded.Any(m => m.Id == activity.Recipient.Id))
                             {
                                 return true;
                             }

templates/Enterprise-Template/src/csharp/EnterpriseBotTemplate/EnterpriseTemplate/Extensions/ActivityExtensions.cs

@@ -32,7 +32,7 @@ public static bool IsStartActivity(this Activity activity)
                         if (activity.Type == ActivityTypes.ConversationUpdate)
                         {
                             // When bot is added to the conversation (triggers start only once per conversation)
-                            if (activity.MembersAdded.Any(m => m.Id == activity.Recipient.Id))
+                            if (activity.MembersAdded != null && activity.MembersAdded.Any(m => m.Id == activity.Recipient.Id))
                             {
                                 return true;
                             }